diff options
| author | Juri Linkov <juri@jurta.org> | 2011-01-16 01:04:22 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-01-16 01:04:22 +0000 |
| commit | d4119912fb6872f1311a97d8cf318b456f5cdef9 (patch) | |
| tree | cd34c2efa4124cc7f0f2198817adc4ee0bc8e177 /lisp | |
| parent | dc3e3e7b221323253581f4a4cab53303f7c3f207 (diff) | |
| download | emacs-d4119912fb6872f1311a97d8cf318b456f5cdef9.tar.gz | |
* lisp/isearch.el (isearch-abort): Don't quit if search has
an incomplete regexp (isearch-error is non-nil). (Bug#7534)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c772934c20..0a4dc699953 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-16 Juri Linkov <juri@jurta.org> + + * isearch.el (isearch-abort): Don't quit if search has + an incomplete regexp (isearch-error is non-nil). (Bug#7534) + 2011-01-15 Mark Diekhans <markd@soe.ucsc.edu> * files.el (backup-buffer): Make last-resort backup file in diff --git a/lisp/isearch.el b/lisp/isearch.el index d8efe78d856..7fd96df1b07 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1244,9 +1244,9 @@ Use `isearch-exit' to quit without signaling." (interactive) ;; (ding) signal instead below, if quitting (discard-input) - (if isearch-success - ;; If search is successful, move back to starting point - ;; and really do quit. + (if (and isearch-success (not isearch-error)) + ;; If search is successful and has no incomplete regexp, + ;; move back to starting point and really do quit. (progn (setq isearch-success nil) (isearch-cancel)) |