(tags-query-replace): Set arg `map' of `perform-replace'

to `multi-query-replace-map'.

2 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51ce3690812..6ea835e256a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2008-07-23  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (multi-query-replace-map): New variable.
+        (perform-replace): Add processing of new multi-buffer keys bound
+        to `automatic-all' and `exit-current'.  Set `query-flag' to nil
+        if last input char was `automatic-all'.  Set new local variable
+        `multi-buffer' to t when one of new two keys were typed.  Return
+        non-nil value of `multi-buffer' that tells to calling functions
+        to continue replacement on the next file.
+
+        * progmodes/etags.el (tags-query-replace): Set arg `map' of
+        `perform-replace' to `multi-query-replace-map'.
+
 2008-07-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * diff-mode.el (diff-auto-refine-mode): Remove lighter, since it's
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 4e4fdd63abf..a94780a7484 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1865,7 +1865,8 @@ See also the documentation of the variable `tags-file-name'."
                               ;; to the beginning of it so perform-replace
                               ;; will see it.
                               (goto-char (match-beginning 0))))
-        tags-loop-operate `(perform-replace ',from ',to t t ',delimited))
+        tags-loop-operate `(perform-replace ',from ',to t t ',delimited
+                                            nil multi-query-replace-map))
   (tags-loop-continue (or file-list-form t)))
 
 (defun tags-complete-tags-table-file (string predicate what) ; Doc string?