From: Juri Linkov <juri@linkov.net>
Date: Wed, 18 Sep 2019 22:12:36 +0000 (+0300)
Subject: * lisp/isearch.el (isearch-lazy-highlight-update): Remember timer object
X-Git-Tag: emacs-27.0.90~1551^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=107ce3050fc37b9a13d8304ae1bb73fac9de5f61;p=emacs.git

* lisp/isearch.el (isearch-lazy-highlight-update): Remember timer object

in isearch-lazy-highlight-timer to cancel it in lazy-highlight-cleanup.

(isearch-done): No need to set isearch-lazy-highlight-start to nil -
it used to reset lazy-highlight loop like isearch-lazy-highlight-window-start,
but now other packages set isearch-lazy-highlight-last-string to nil to reset
lazy-highlight loop.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 9401e8c06d3..ec51c2cf4cc 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1370,7 +1370,6 @@ NOPUSH is t and EDIT is t."
   (remove-hook 'post-command-hook 'isearch-post-command-hook)
   (remove-hook 'mouse-leave-buffer-hook 'isearch-mouse-leave-buffer)
   (remove-hook 'kbd-macro-termination-hook 'isearch-done)
-  (setq isearch-lazy-highlight-start nil)
   (when (buffer-live-p isearch--current-buffer)
     (with-current-buffer isearch--current-buffer
       (setq isearch--current-buffer nil)
@@ -3970,8 +3969,9 @@ Attempt to do the search exactly the way the pending Isearch would."
 		  (if isearch-lazy-highlight-forward
 		      (setq isearch-lazy-highlight-end (point-min))
 		    (setq isearch-lazy-highlight-start (point-max)))
-		  (run-at-time lazy-highlight-interval nil
-			       'isearch-lazy-highlight-buffer-update))
+		  (setq isearch-lazy-highlight-timer
+			(run-at-time lazy-highlight-interval nil
+				     'isearch-lazy-highlight-buffer-update)))
 	      (setq isearch-lazy-highlight-timer
 		    (run-at-time lazy-highlight-interval nil
 				 'isearch-lazy-highlight-update)))))))))