From: Juri Linkov Date: Fri, 2 Dec 2011 10:45:44 +0000 (+0200) Subject: * lisp/info.el (Info-search): Display "end of manual" when Isearch X-Git-Tag: emacs-pretest-24.0.93~232^2~34 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb0a02ea733562a3965f7e734dff0a8f98572fcb;p=emacs.git * 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 b5b3eb0231d..fc32133f3f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-02 Juri Linkov + + * 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 * isearch.el (isearch-message-prefix): Run the input method part diff --git a/lisp/info.el b/lisp/info.el index 02f84a54af9..c1dae66bea2 100644 --- 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)