diff options
| author | Karl Heuer | 1994-05-07 01:33:23 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-05-07 01:33:23 +0000 |
| commit | 8eb40e74cd3c2134dde21cdcdc37db55cbb66954 (patch) | |
| tree | d9bfe2df59dd92f6e30ac1c4097a7af2aec1e406 | |
| parent | 19134c18f4df3deee1aad2f7659aa9ca582d1104 (diff) | |
| download | emacs-8eb40e74cd3c2134dde21cdcdc37db55cbb66954.tar.gz emacs-8eb40e74cd3c2134dde21cdcdc37db55cbb66954.zip | |
(isearch-edit-string): Doc fix.
(isearch-message-prefix): Initialize `isearch-within-brackets'.
| -rw-r--r-- | lisp/isearch.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 20d85caf6fb..98bb768a134 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> | 5 | ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> |
| 6 | 6 | ||
| 7 | ;; |$Date: 1994/05/03 08:27:40 $|$Revision: 1.66 $ | 7 | ;; |$Date: 1994/05/03 22:34:16 $|$Revision: 1.67 $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -669,11 +669,11 @@ The following additional command keys are active while editing. | |||
| 669 | \\[exit-minibuffer] to resume incremental searching with the edited string. | 669 | \\[exit-minibuffer] to resume incremental searching with the edited string. |
| 670 | \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. | 670 | \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. |
| 671 | \\[isearch-forward-exit-minibuffer] to resume isearching forward. | 671 | \\[isearch-forward-exit-minibuffer] to resume isearching forward. |
| 672 | \\[isearch-backward-exit-minibuffer] to resume isearching backward. | 672 | \\[isearch-reverse-exit-minibuffer] to resume isearching backward. |
| 673 | \\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring. | 673 | \\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring. |
| 674 | \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring. | 674 | \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring. |
| 675 | \\[isearch-complete-edit] to complete the search string using the search ring. | 675 | \\[isearch-complete-edit] to complete the search string using the search ring. |
| 676 | 676 | \\<isearch-mode-map> | |
| 677 | If first char entered is \\[isearch-yank-word], then do word search instead." | 677 | If first char entered is \\[isearch-yank-word], then do word search instead." |
| 678 | 678 | ||
| 679 | ;; This code is very hairy for several reasons, explained in the code. | 679 | ;; This code is very hairy for several reasons, explained in the code. |
| @@ -1295,7 +1295,8 @@ If there is no completion possible, say so and continue searching." | |||
| 1295 | (and isearch-invalid-regexp ellipsis | 1295 | (and isearch-invalid-regexp ellipsis |
| 1296 | (condition-case () | 1296 | (condition-case () |
| 1297 | (progn (re-search-forward isearch-string (point) t) | 1297 | (progn (re-search-forward isearch-string (point) t) |
| 1298 | (setq isearch-invalid-regexp nil)) | 1298 | (setq isearch-invalid-regexp nil |
| 1299 | isearch-within-brackets nil)) | ||
| 1299 | (error nil))) | 1300 | (error nil))) |
| 1300 | ;; If currently failing, display no ellipsis. | 1301 | ;; If currently failing, display no ellipsis. |
| 1301 | (or isearch-success (setq ellipsis nil)) | 1302 | (or isearch-success (setq ellipsis nil)) |