Commit cb0a02ea authored by Juri Linkov's avatar Juri Linkov
Browse files

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

reaches the end of single-file Info manual.

Fixes: debbugs:9918
parent dd782f24
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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment