[Emacs-diffs] /srv/bzr/emacs/trunk r110560: * doc/emacs/search.texi (Query Replace): Document multi-buffer replacement keys.

[Juri Linkov]

------------------------------------------------------------
revno: 110560
fixes bug: http://debbugs.gnu.org/12655
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-17 02:27:40 +0300
message:
  * doc/emacs/search.texi (Query Replace): Document multi-buffer replacement 
keys. 
  
  * doc/emacs/maintaining.texi (Tags Search): Change link "Replace" to
  "Query Replace".
  
  * lisp/replace.el (query-replace-help): Mention multi-buffer replacement
  keys in the Help message.
modified:
  doc/emacs/ChangeLog
  doc/emacs/maintaining.texi
  doc/emacs/search.texi
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-10-13 01:18:52 +0000
+++ b/doc/emacs/ChangeLog       2012-10-16 23:27:40 +0000
@@ -1,3 +1,11 @@
+2012-10-16  Juri Linkov  <address@hidden>
+
+       * search.texi (Query Replace): Document multi-buffer replacement
+       keys.  (Bug#12655)
+
+       * maintaining.texi (Tags Search): Change link "Replace" to
+       "Query Replace".
+
 2012-10-13  Chong Yidong  <address@hidden>
 
        * files.texi (File Conveniences): ImageMagick enabled by default.

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2012-10-02 06:44:30 +0000
+++ b/doc/emacs/maintaining.texi        2012-10-16 23:27:40 +0000
@@ -2221,7 +2221,7 @@
 reads a regexp to search for and a string to replace with, just like
 ordinary @kbd{M-x query-replace-regexp}.  It searches much like @kbd{M-x
 tags-search}, but repeatedly, processing matches according to your
-input.  @xref{Replace}, for more information on query replace.
+input.  @xref{Query Replace}, for more information on query replace.
 
 @vindex tags-case-fold-search
 @cindex case-sensitivity and tags search

=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi     2012-09-30 09:18:38 +0000
+++ b/doc/emacs/search.texi     2012-10-16 23:27:40 +0000
@@ -1239,6 +1239,19 @@
 @item !
 to replace all remaining occurrences without asking again.
 
address@hidden Y @r{(Upper-case)}
+to replace all remaining occurrences in all remaining buffers in
+multi-buffer replacements (like the Dired `Q' command which performs
+query replace on selected files).  It answers this question and all
+subsequent questions in the series with "yes", without further
+user interaction.
+
address@hidden N @r{(Upper-case)}
+to skip to the next buffer in multi-buffer replacements without
+replacing remaining occurrences in the current buffer.  It answers
+this question "no", gives up on the questions for the current buffer,
+and continues to the next buffer in the sequence.
+
 @item ^
 to go back to the position of the previous occurrence (or what used to
 be an occurrence), in case you changed it by mistake or want to

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-15 04:03:04 +0000
+++ b/lisp/ChangeLog    2012-10-16 23:27:40 +0000
@@ -1,3 +1,8 @@
+2012-10-16  Juri Linkov  <address@hidden>
+
+       * replace.el (query-replace-help): Mention multi-buffer replacement
+       keys in the Help message.  (Bug#12655)
+
 2012-10-15  Chong Yidong  <address@hidden>
 
        * emacs-lisp/byte-run.el (defsubst): Doc fix.

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2012-10-04 19:28:11 +0000
+++ b/lisp/replace.el   2012-10-16 23:27:40 +0000
@@ -1603,9 +1603,13 @@
 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again),
 C-w to delete match and recursive edit,
 C-l to clear the screen, redisplay, and offer same replacement again,
-! to replace all remaining matches with no more questions,
+! to replace all remaining matches in this buffer with no more questions,
 ^ to move point back to previous match,
-E to edit the replacement string"
+E to edit the replacement string.
+In multi-buffer replacements type `Y' to replace all remaining
+matches in all remaining buffers with no more questions,
+`N' to skip to the next buffer without replacing remaining matches
+in the current buffer."
   "Help message while in `query-replace'.")
 
 (defvar query-replace-map