From f5cb5bb8281ee17b013a3b9187e92fda4b1047a9 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 4 May 2020 01:31:44 +0300 Subject: [PATCH] Revert part of recent commit 85544f8ef5 (bug#40808) * lisp/isearch.el (isearch-lazy-highlight-search): Remove recent fix of lazy-highlighting of hidden matches. In emacs-27 leave only the fix for lazy-counting of hidden matches when isearch-lazy-count is non-nil. ; Do not merge to master. --- lisp/isearch.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/isearch.el b/lisp/isearch.el index 1a414830ee8..57b13a38d67 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -3866,10 +3866,9 @@ Attempt to do the search exactly the way the pending Isearch would." (isearch-regexp-lax-whitespace isearch-lazy-highlight-regexp-lax-whitespace) (isearch-forward isearch-lazy-highlight-forward) - ;; Don't match invisible text unless it can be opened - ;; or when counting matches and user can visit hidden matches - (search-invisible (or (eq search-invisible 'open) - (and isearch-lazy-count search-invisible))) + ;; Match invisible text only when counting matches + ;; and user can visit invisible matches + (search-invisible (and isearch-lazy-count search-invisible t)) (retry t) (success nil)) ;; Use a loop like in `isearch-search'. -- 2.39.5