(isearch-update): Test isearch-lazy-highlight

before calling isearch-lazy-highlight-new-loop.
(isearch-lazy-highlight-new-loop):
Don't test isearch-lazy-highlight.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 9ee9b4d8521bb0de5d874ba7ade4db288f6f076e..f94590ded2db4fe808634e1ab0c08464e6f578a3 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -653,7 +653,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
   (setq ;; quit-flag nil  not for isearch-mode
    isearch-adjusted nil
    isearch-yank-flag nil)
-  (isearch-lazy-highlight-new-loop)
+  (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop))
   ;; We must prevent the point moving to the end of composition when a
   ;; part of the composition has just been searched.
   (setq disable-point-adjustment t))
@@ -2333,8 +2333,7 @@ is nil.  This function is called when exiting an incremental search if
   "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one.
 This happens when `isearch-update' is invoked (which can cause the
 search string to change or the window to scroll)."
-  (when (and isearch-lazy-highlight
-            (null executing-kbd-macro)
+  (when (and (null executing-kbd-macro)
              (sit-for 0)         ;make sure (window-start) is credible
              (or (not (equal isearch-string
                              isearch-lazy-highlight-last-string))