* lisp/info.el (Info-search): Display "end of manual" when Isearch

reaches the end of single-file Info manual.

Fixes: debbugs:9918

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5b3eb0231d760c5f4bc412f36d0cc2809d5d84c..fc32133f3f8d3c8ebd6591378e0cb89ea8b2531c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+       * 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  <eliz@gnu.org>
 
        * isearch.el (isearch-message-prefix): Run the input method part

diff --git a/lisp/info.el b/lisp/info.el
index 02f84a54af9add381134366eebb20242aaf06c37..c1dae66bea2b71fe2d20ba43595b129800c8ad81 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1769,12 +1769,14 @@ If DIRECTION is `backward', search in the reverse direction."
       ;; 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 DIRECTION is `backward', search in the reverse direction."
              (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)