mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
reaches the end of single-file Info manual.

Fixes: debbugs:9918
This commit is contained in:
Juri Linkov 2011-12-02 12:45:44 +02:00
parent dd782f24e5
commit cb0a02ea73
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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> 2011-12-02 Eli Zaretskii <eliz@gnu.org>
* isearch.el (isearch-message-prefix): Run the input method part * isearch.el (isearch-message-prefix): Run the input method part

6
lisp/info.el
View file

@ -1769,12 +1769,14 @@ If DIRECTION is `backward', search in the reverse direction."
;; If no subfiles, give error now. ;; If no subfiles, give error now.
(if give-up (if give-up
(if (null Info-current-subfile) (if (null Info-current-subfile)
(if isearch-mode
(signal 'search-failed (list regexp "end of manual"))
(let ((search-spaces-regexp (let ((search-spaces-regexp
(if (or (not isearch-mode) isearch-regexp) (if (or (not isearch-mode) isearch-regexp)
Info-search-whitespace-regexp))) Info-search-whitespace-regexp)))
(if backward (if backward
(re-search-backward regexp) (re-search-backward regexp)
(re-search-forward regexp))) (re-search-forward regexp))))
(setq found nil))) (setq found nil)))
(if (and bound (not found)) (if (and bound (not found))
@ -1845,7 +1847,7 @@ If DIRECTION is `backward', search in the reverse direction."
(if found (if found
(message "") (message "")
(signal 'search-failed (if isearch-mode (signal 'search-failed (if isearch-mode
(list regexp "end of the manual") (list regexp "end of manual")
(list regexp))))) (list regexp)))))
(if (not found) (if (not found)
(progn (Info-read-subfile osubfile) (progn (Info-read-subfile osubfile)