* lisp/replace.el (perform-replace): Avoid `isearch-range-invisible'

call when `query-flag' is nil and `search-invisible' is non-nil.

Fixes: debbugs:11746

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33f0f787d74cf6a232b9384c5df31bb5c94555a3..e7532cdbd07701e6507781e4669655b90e8f470b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-30  Juri Linkov  <juri@jurta.org>
+
+       * replace.el (perform-replace): Avoid `isearch-range-invisible'
+       call when `query-flag' is nil and `search-invisible' is non-nil.
+       (Bug#11746)
+
 2013-05-30  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New.

diff --git a/lisp/replace.el b/lisp/replace.el
index 15d5f2694a8d9a147bbd6f171b23496c13b0a078..af05bd11fb2f57d0b5910ce1f682a54e7da1114f 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2093,6 +2093,9 @@ make, or the user didn't cancel the call."
            (setq skip-filtered-count (1+ skip-filtered-count)))
           ;; Optionally ignore invisible matches.
           ((not (or (eq search-invisible t)
+                    ;; Don't open overlays for automatic replacements.
+                    (and (not query-flag) search-invisible)
+                    ;; Open hidden overlays for interactive replacements.
                     (not (isearch-range-invisible
                           (nth 0 real-match-data) (nth 1 real-match-data)))))
            (setq skip-invisible-count (1+ skip-invisible-count)))