(Search and Replace): Document `multi-query-replace-map'.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9dd3a77636a0b7c5d8a7920fc324cec4b51a54af..1ea66a9b8fa9b922d2c42204b0eaa1d184511170 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,7 +1,11 @@
 2008-10-18  Eli Zaretskii  <eliz@gnu.org>
 
+       * maps.texi (Standard Keymaps): Document `multi-query-replace-map'
+       and `search-map'.
+
        * searching.texi (Search and Replace): Document
        `replace-search-function' and `replace-re-search-function'.
+       Document `multi-query-replace-map'.
 
        * minibuf.texi (Text from Minibuffer): Document `read-regexp'.
        (Completion Commands, Reading File Names): Rename

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 6bca6c79f2722476b1c2326d2dfc543842808cd7..36c3638b0945fb1c96f8c3786e5e28a68feade94 100644 (file)
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1719,6 +1719,12 @@ use this answer.
 Display some help, then ask again.
 @end table
 
+@defvar multi-query-replace-map
+This variable holds a keymap that extends @code{query-replace-map} by
+providing additional keybindings that are useful in multi-buffer
+replacements.
+@end defvar
+
 @defvar replace-search-function
 This variable specifies a function that @code{perform-replace} calls
 to search for the next string to replace.  Its default value is

diff --git a/etc/NEWS b/etc/NEWS
index de994736a2c825dbbc7c53f5bcf62d4172e84b3a..06d9ecbff9182034f0ecefb4de81adca9c00cdfe 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1285,15 +1285,19 @@ function to use for searching in `query-replace-regexp',
 `map-query-replace-regexp'.  The function it specifies is called by
 `perform-replace' when its 4th argument is non-nil.
 
++++
 *** New keymap `search-map' bound to `M-s' provides global bindings
 for search related commands.
 
++++
 *** New keymap `multi-query-replace-map' contains additonal keys bound
 to `automatic-all' and `exit-current' for multi-buffer interactive replacement.
 
+---
 *** The variable `inhibit-changing-match-data', if non-nil, prevents
 the search and match primitives from changing the match data.
 
+---
 *** New functions `word-search-forward-lax' and `word-search-backward-lax'.
 These are like `word-search-forward and `word-search-backward', except
 that the end of the search string need not match a word boundary,