diff options
| author | Joakim Verona <joakim@verona.se> | 2011-12-28 04:12:56 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2011-12-28 04:12:56 +0100 |
| commit | bb29f044aa967831cd664c54eba0de0c701436ce (patch) | |
| tree | 1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/info.el | |
| parent | 3c935a7e996701244d166f684119f0ff97e25496 (diff) | |
| parent | 5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff) | |
| download | emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.bz2 emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip | |
upstream i think
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/info.el b/lisp/info.el index 4f2f33d017c..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) @@ -3240,7 +3242,7 @@ search results." (Info-index topic) (push (cons (cons Info-current-file topic) Info-index-alternatives) Info-virtual-index-nodes) - ;; Clean up unneccessary side-effects of `Info-index'. + ;; Clean up unnecessary side-effects of `Info-index'. (setq Info-history-list ohist-list) (Info-goto-node orignode) (message ""))) |