Mercurial > emacs

changeset 58972:71d0bc7835fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(isearch-update): Test isearch-lazy-highlight before calling isearch-lazy-highlight-new-loop. (isearch-lazy-highlight-new-loop): Don't test isearch-lazy-highlight.
author Juri Linkov <juri@jurta.org>
date Wed, 15 Dec 2004 10:08:51 +0000
parents 042f31a6be01
children 7fed010105d9
files lisp/isearch.el
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Wed Dec 15 06:39:29 2004 +0000
+++ b/lisp/isearch.el	Wed Dec 15 10:08:51 2004 +0000
@@ -653,7 +653,7 @@
   (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 @@
   "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))