[Emacs-diffs] /srv/bzr/emacs/trunk r102863: * lisp/isearch.el (isearch-abort): Don't quit if search has

[Juri Linkov]

------------------------------------------------------------
revno: 102863
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-16 01:04:22 +0000
message:
  * lisp/isearch.el (isearch-abort): Don't quit if search has
  an incomplete regexp (isearch-error is non-nil).  (Bug#7534)
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-15 20:38:27 +0000
+++ b/lisp/ChangeLog    2011-01-16 01:04:22 +0000
@@ -1,3 +1,8 @@
+2011-01-16  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (backup-buffer): Make last-resort backup file in

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-01-15 23:16:57 +0000
+++ b/lisp/isearch.el   2011-01-16 01:04:22 +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))