[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100321: * lisp/isearch.el (isearch-lazy-highlight-error): New variable.

[Juri Linkov]

------------------------------------------------------------
revno: 100321
committer: Juri Linkov <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-12-20 01:18:15 +0000
message:
  * lisp/isearch.el (isearch-lazy-highlight-error): New variable.
  (isearch-lazy-highlight-new-loop): Compare `isearch-error' and
  `isearch-lazy-highlight-error'.  Set `isearch-lazy-highlight-error'
  to the current value of `isearch-error' (Bug#7468).
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-17 11:38:22 +0000
+++ b/lisp/ChangeLog    2010-12-20 01:18:15 +0000
@@ -1,3 +1,10 @@
+2010-12-20  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-lazy-highlight-error): New variable.
+       (isearch-lazy-highlight-new-loop): Compare `isearch-error' and
+       `isearch-lazy-highlight-error'.  Set `isearch-lazy-highlight-error'
+       to the current value of `isearch-error' (Bug#7468).
+
 2010-12-17  Chong Yidong  <address@hidden>
 
        * help-fns.el (describe-variable): Don't emit trailing whitespace

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2010-09-23 07:05:22 +0000
+++ b/lisp/isearch.el   2010-12-20 01:18:15 +0000
@@ -2579,6 +2579,7 @@
 (defvar isearch-lazy-highlight-regexp nil)
 (defvar isearch-lazy-highlight-space-regexp nil)
 (defvar isearch-lazy-highlight-forward nil)
+(defvar isearch-lazy-highlight-error nil)
 
 (defun lazy-highlight-cleanup (&optional force)
   "Stop lazy highlighting and remove extra highlighting from current buffer.
@@ -2620,9 +2621,13 @@
                  (not (= (window-end)   ; Window may have been split/joined.
                         isearch-lazy-highlight-window-end))
                 (not (eq isearch-forward
-                         isearch-lazy-highlight-forward))))
+                         isearch-lazy-highlight-forward))
+                ;; In case we are recovering from an error.
+                (not (equal isearch-error
+                            isearch-lazy-highlight-error))))
     ;; something important did indeed change
     (lazy-highlight-cleanup t) ;kill old loop & remove overlays
+    (setq isearch-lazy-highlight-error isearch-error)
     (when (not isearch-error)
       (setq isearch-lazy-highlight-start-limit beg
            isearch-lazy-highlight-end-limit end)