diff options
| author | Richard M. Stallman | 1995-03-18 18:10:21 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-03-18 18:10:21 +0000 |
| commit | 925a67ca07b1c9986d432be8c3105dd04c65de22 (patch) | |
| tree | 62a5f29b7b9feed57e56b6d38b4bb4b7f677df6e | |
| parent | 95626e112bf3663c0900974609b4f1a0ab890aed (diff) | |
| download | emacs-925a67ca07b1c9986d432be8c3105dd04c65de22.tar.gz emacs-925a67ca07b1c9986d432be8c3105dd04c65de22.zip | |
(isearch-abort): Treat "incomplete regexp"
as failure when deciding how much to discard for C-g.
| -rw-r--r-- | lisp/isearch.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 90c26744978..79f2c5d11ce 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: 1995/01/11 02:24:09 $|$Revision: 1.83 $ | 7 | ;; |$Date: 1995/03/16 23:31:39 $|$Revision: 1.84 $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -800,8 +800,10 @@ Use `isearch-exit' to quit without signalling." | |||
| 800 | (setq isearch-success nil) | 800 | (setq isearch-success nil) |
| 801 | (isearch-done t) ; exit isearch | 801 | (isearch-done t) ; exit isearch |
| 802 | (signal 'quit nil)) ; and pass on quit signal | 802 | (signal 'quit nil)) ; and pass on quit signal |
| 803 | ;; If search is failing, rub out until it is once more successful. | 803 | ;; If search is failing, or has an incomplete regexp, |
| 804 | (while (not isearch-success) (isearch-pop-state)) | 804 | ;; rub out until it is once more successful. |
| 805 | (while (or (not isearch-success) isearch-invalid-regexp) | ||
| 806 | (isearch-pop-state)) | ||
| 805 | (isearch-update))) | 807 | (isearch-update))) |
| 806 | 808 | ||
| 807 | (defun isearch-repeat (direction) | 809 | (defun isearch-repeat (direction) |