[Emacs-diffs] /srv/bzr/emacs/trunk r112791: * lisp/replace.el (perform-replace): Avoid `isearch-range-invisible'

[Juri Linkov]

------------------------------------------------------------
revno: 112791
fixes bug: http://debbugs.gnu.org/11746
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-31 02:29:42 +0300
message:
  * lisp/replace.el (perform-replace): Avoid `isearch-range-invisible'
  call when `query-flag' is nil and `search-invisible' is non-nil.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-30 23:20:05 +0000
+++ b/lisp/ChangeLog    2013-05-30 23:29:42 +0000
@@ -1,3 +1,9 @@
+2013-05-30  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): New.

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-05-29 23:43:39 +0000
+++ b/lisp/replace.el   2013-05-30 23:29:42 +0000
@@ -2093,6 +2093,9 @@
            (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)))