aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2020-05-04 01:31:44 +0300
committerJuri Linkov2020-05-04 01:31:44 +0300
commitf5cb5bb8281ee17b013a3b9187e92fda4b1047a9 (patch)
tree0f7992db45d82a65393cf050acd96e0bea589d6c
parentf9fa726cede2d90501e5b8f0d93bfa4ce134868d (diff)
downloademacs-f5cb5bb8281ee17b013a3b9187e92fda4b1047a9.tar.gz
emacs-f5cb5bb8281ee17b013a3b9187e92fda4b1047a9.zip
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.
-rw-r--r--lisp/isearch.el7
1 files 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."
3866 (isearch-regexp-lax-whitespace 3866 (isearch-regexp-lax-whitespace
3867 isearch-lazy-highlight-regexp-lax-whitespace) 3867 isearch-lazy-highlight-regexp-lax-whitespace)
3868 (isearch-forward isearch-lazy-highlight-forward) 3868 (isearch-forward isearch-lazy-highlight-forward)
3869 ;; Don't match invisible text unless it can be opened 3869 ;; Match invisible text only when counting matches
3870 ;; or when counting matches and user can visit hidden matches 3870 ;; and user can visit invisible matches
3871 (search-invisible (or (eq search-invisible 'open) 3871 (search-invisible (and isearch-lazy-count search-invisible t))
3872 (and isearch-lazy-count search-invisible)))
3873 (retry t) 3872 (retry t)
3874 (success nil)) 3873 (success nil))
3875 ;; Use a loop like in `isearch-search'. 3874 ;; Use a loop like in `isearch-search'.