aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-05-31 02:29:42 +0300
committerJuri Linkov2013-05-31 02:29:42 +0300
commitab1bdce51e336b4433dbbc0949b4dc02773831de (patch)
treee4259e3d44c4a03127c5db6cb4895f3216241899
parent2a8bed1c0266166b759578fad0fc408067f6441c (diff)
downloademacs-ab1bdce51e336b4433dbbc0949b4dc02773831de.tar.gz
emacs-ab1bdce51e336b4433dbbc0949b4dc02773831de.zip
* lisp/replace.el (perform-replace): Avoid `isearch-range-invisible'
call when `query-flag' is nil and `search-invisible' is non-nil. Fixes: debbugs:11746
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/replace.el3
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33f0f787d74..e7532cdbd07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-05-30 Juri Linkov <juri@jurta.org>
2
3 * replace.el (perform-replace): Avoid `isearch-range-invisible'
4 call when `query-flag' is nil and `search-invisible' is non-nil.
5 (Bug#11746)
6
12013-05-30 Glenn Morris <rgm@gnu.org> 72013-05-30 Glenn Morris <rgm@gnu.org>
2 8
3 * progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New. 9 * progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New.
diff --git a/lisp/replace.el b/lisp/replace.el
index 15d5f2694a8..af05bd11fb2 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2093,6 +2093,9 @@ make, or the user didn't cancel the call."
2093 (setq skip-filtered-count (1+ skip-filtered-count))) 2093 (setq skip-filtered-count (1+ skip-filtered-count)))
2094 ;; Optionally ignore invisible matches. 2094 ;; Optionally ignore invisible matches.
2095 ((not (or (eq search-invisible t) 2095 ((not (or (eq search-invisible t)
2096 ;; Don't open overlays for automatic replacements.
2097 (and (not query-flag) search-invisible)
2098 ;; Open hidden overlays for interactive replacements.
2096 (not (isearch-range-invisible 2099 (not (isearch-range-invisible
2097 (nth 0 real-match-data) (nth 1 real-match-data))))) 2100 (nth 0 real-match-data) (nth 1 real-match-data)))))
2098 (setq skip-invisible-count (1+ skip-invisible-count))) 2101 (setq skip-invisible-count (1+ skip-invisible-count)))