* 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 1c772934c206c6f6711067493882ed0b7c0bde7f..0a4dc69995330d930fa029ab95b7ff9cbda2f083 100644 (file)
--- 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 d8efe78d8563e3bcee7a55b5333da0169ab88e51..7fd96df1b07a57fbe225ced3db1851d381aa773b 100644 (file)
--- 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))