[Emacs-diffs] /srv/bzr/emacs/trunk r106578: * lisp/info.el (Info-search): Display "end of manual" when Isearch

[Juri Linkov]

------------------------------------------------------------
revno: 106578
fixes bug(s): http://debbugs.gnu.org/9918
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-02 12:45:44 +0200
message:
  * lisp/info.el (Info-search): Display "end of manual" when Isearch
  reaches the end of single-file Info manual.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-02 10:35:17 +0000
+++ b/lisp/ChangeLog    2011-12-02 10:45:44 +0000
@@ -1,3 +1,8 @@
+2011-12-02  Juri Linkov  <address@hidden>
+
+       * info.el (Info-search): Display "end of manual" when Isearch
+       reaches the end of single-file Info manual.  (Bug#9918)
+
 2011-12-02  Eli Zaretskii  <address@hidden>
 
        * isearch.el (isearch-message-prefix): Run the input method part

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2011-11-23 07:03:56 +0000
+++ b/lisp/info.el      2011-12-02 10:45:44 +0000
@@ -1769,12 +1769,14 @@
       ;; If no subfiles, give error now.
       (if give-up
          (if (null Info-current-subfile)
-             (let ((search-spaces-regexp
-                    (if (or (not isearch-mode) isearch-regexp)
-                        Info-search-whitespace-regexp)))
-               (if backward
-                   (re-search-backward regexp)
-                 (re-search-forward regexp)))
+             (if isearch-mode
+                 (signal 'search-failed (list regexp "end of manual"))
+               (let ((search-spaces-regexp
+                      (if (or (not isearch-mode) isearch-regexp)
+                          Info-search-whitespace-regexp)))
+                 (if backward
+                     (re-search-backward regexp)
+                   (re-search-forward regexp))))
            (setq found nil)))
 
       (if (and bound (not found))
@@ -1845,7 +1847,7 @@
              (if found
                  (message "")
                (signal 'search-failed (if isearch-mode
-                                          (list regexp "end of the manual")
+                                          (list regexp "end of manual")
                                         (list regexp)))))
          (if (not found)
              (progn (Info-read-subfile osubfile)