emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 f5cb5bb: Revert part of recent commit 85544f8ef5 (bug#40808)


From: Juri Linkov
Subject: emacs-27 f5cb5bb: Revert part of recent commit 85544f8ef5 (bug#40808)
Date: Sun, 3 May 2020 18:31:51 -0400 (EDT)

branch: emacs-27
commit f5cb5bb8281ee17b013a3b9187e92fda4b1047a9
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>

    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 1a41483..57b13a3 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'.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]