* lisp/isearch.el (isearch-lazy-highlight-word): New variable.

(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.

Fixes: debbugs:9727

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02aac0e..ec1a309 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-11  Juri Linkov  <juri@jurta.org>
+
+       * isearch.el (isearch-lazy-highlight-word): New variable.
+       (isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
+       Use it.  (Bug#9727)
+
 2011-10-11  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/f90.el (f90-next-statement): Ignore preprocessor lines,

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 81e0b4b..6cfcce5 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2617,6 +2617,7 @@ since they have special meaning in a regexp."
 (defvar isearch-lazy-highlight-case-fold-search nil)
 (defvar isearch-lazy-highlight-regexp nil)
 (defvar isearch-lazy-highlight-space-regexp nil)
+(defvar isearch-lazy-highlight-word nil)
 (defvar isearch-lazy-highlight-forward nil)
 (defvar isearch-lazy-highlight-error nil)
 
@@ -2655,6 +2656,8 @@ by other Emacs features."
                          isearch-case-fold-search))
                 (not (eq isearch-lazy-highlight-regexp
                          isearch-regexp))
+                (not (eq isearch-lazy-highlight-word
+                         isearch-word))
                  (not (= (window-start)
                          isearch-lazy-highlight-window-start))
                  (not (= (window-end)   ; Window may have been split/joined.
@@ -2675,11 +2678,12 @@ by other Emacs features."
             isearch-lazy-highlight-window-end   (window-end)
             isearch-lazy-highlight-start        (point)
             isearch-lazy-highlight-end          (point)
+            isearch-lazy-highlight-wrapped      nil
             isearch-lazy-highlight-last-string  isearch-string
            isearch-lazy-highlight-case-fold-search isearch-case-fold-search
-           isearch-lazy-highlight-regexp       isearch-regexp
-            isearch-lazy-highlight-wrapped      nil
+           isearch-lazy-highlight-regexp       isearch-regexp
            isearch-lazy-highlight-space-regexp search-whitespace-regexp
+           isearch-lazy-highlight-word         isearch-word
            isearch-lazy-highlight-forward      isearch-forward)
       (unless (equal isearch-string "")
        (setq isearch-lazy-highlight-timer
@@ -2693,6 +2697,7 @@ Attempt to do the search exactly the way the pending Isearch would."
       (let ((case-fold-search isearch-lazy-highlight-case-fold-search)
            (isearch-regexp isearch-lazy-highlight-regexp)
            (search-spaces-regexp isearch-lazy-highlight-space-regexp)
+           (isearch-word isearch-lazy-highlight-word)
            (search-invisible nil)      ; don't match invisible text
            (retry t)
            (success nil)