From 8a52f12872d2b99acb2ca5a2077ccd87779309fe Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Mon, 2 Nov 2015 13:54:15 +0000 Subject: [PATCH 2/3] * lisp/isearch.el: Bind a variable while lazy-highlighting (isearch-lazy-highlight-ongoing-search): New variable. (isearch-lazy-highlight-search): Use it. --- lisp/isearch.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/isearch.el b/lisp/isearch.el index 6442166..ef49650 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -3080,11 +3080,18 @@ isearch-lazy-highlight-new-loop (run-with-idle-timer lazy-highlight-initial-delay nil 'isearch-lazy-highlight-update))))) +(defvar isearch-lazy-highlight-ongoing-search nil + "Dynamically bound to t in `isearch-lazy-highlight-search'. +This can be used by `isearch-search-fun-function' to detect +whether its return value is being run for a proper user search or +a lazy highlight search.") + (defun isearch-lazy-highlight-search () "Search ahead for the next or previous match, for lazy highlighting. Attempt to do the search exactly the way the pending Isearch would." (condition-case nil (let ((case-fold-search isearch-lazy-highlight-case-fold-search) + (isearch-lazy-highlight-ongoing-search t) (isearch-regexp isearch-lazy-highlight-regexp) (isearch-regexp-function isearch-lazy-highlight-regexp-function) (isearch-lax-whitespace -- 2.6.2