summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2011-01-16 01:04:22 +0000
committerJuri Linkov <juri@jurta.org>2011-01-16 01:04:22 +0000
commitd4119912fb6872f1311a97d8cf318b456f5cdef9 (patch)
treecd34c2efa4124cc7f0f2198817adc4ee0bc8e177 /lisp/isearch.el
parentdc3e3e7b221323253581f4a4cab53303f7c3f207 (diff)
downloademacs-d4119912fb6872f1311a97d8cf318b456f5cdef9.tar.gz
emacs-d4119912fb6872f1311a97d8cf318b456f5cdef9.tar.bz2
emacs-d4119912fb6872f1311a97d8cf318b456f5cdef9.zip
* 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/isearch.el')
-rw-r--r--lisp/isearch.el6
1 files changed, 3 insertions, 3 deletions
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))