Mercurial > emacs
changeset 112280:a0a140d8d84d
* lisp/isearch.el (isearch-abort): Don't quit if search has
an incomplete regexp (isearch-error is non-nil). (Bug#7534)
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Sun, 16 Jan 2011 01:04:22 +0000 |
| parents | 87a2c7d05f19 |
| children | 697cfa263439 |
| files | lisp/ChangeLog lisp/isearch.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 15 15:23:57 2011 -0800 +++ b/lisp/ChangeLog Sun Jan 16 01:04:22 2011 +0000 @@ -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
--- a/lisp/isearch.el Sat Jan 15 15:23:57 2011 -0800 +++ b/lisp/isearch.el Sun Jan 16 01:04:22 2011 +0000 @@ -1244,9 +1244,9 @@ (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))