From: Juri Linkov <juri@jurta.org>
Date: Sun, 16 Jan 2011 01:04:22 +0000 (+0000)
Subject: * lisp/isearch.el (isearch-abort): Don't quit if search has
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~230^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4119912fb6872f1311a97d8cf318b456f5cdef9;p=emacs.git

* lisp/isearch.el (isearch-abort): Don't quit if search has
an incomplete regexp (isearch-error is non-nil).  (Bug#7534)
---

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))