Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

[gnu-emacs] / doc / lispref / maps.texi

diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 44e299a7cf4682645dba0deefbb26129f84bcfa7..d235fee90ee0c063b2af9a7236b5356ba0727e4f 100644 (file)
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -1,7 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1993, 1999, 2001-2011  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/maps
 @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
@@ -112,7 +111,7 @@ Properties menu.
 The sparse keymap that displays the Special Props submenu of the Text
 Properties menu.
 
-@item function-key-map
+@item local-function-key-map
 The keymap for translating key sequences to preferred alternatives.@*
 If there are none, then it contains an empty sparse keymap.
 @xref{Translation Keymaps}.
@@ -163,7 +162,8 @@ search.
 
 @item key-translation-map
 A keymap for translating keys.  This one overrides ordinary key
-bindings, unlike @code{function-key-map}.  @xref{Translation Keymaps}.
+bindings, unlike @code{local-function-key-map}.  @xref{Translation
+Keymaps}.
 
 @item kmacro-map
 @vindex kmacro-map
@@ -182,9 +182,9 @@ A sparse keymap used by Lisp mode.
 @vindex menu-bar-edit-menu
 The keymap which displays the Edit menu in the menu bar.
 
-@item menu-bar-files-menu
-@vindex menu-bar-files-menu
-The keymap which displays the Files menu in the menu bar.
+@item menu-bar-file-menu
+@vindex menu-bar-file-menu
+The keymap which displays the File menu in the menu bar.
 
 @item menu-bar-help-menu
 @vindex menu-bar-help-menu
@@ -208,6 +208,10 @@ global map.  This map is not actually mode specific: its name was chosen
 to be informative for the user in @kbd{C-h b} (@code{display-bindings}),
 where it describes the main use of the @kbd{C-c} prefix key.
 
+@item multi-query-replace-map
+A sparse keymap that extends @code{query-replace-map} for multi-buffer
+replacements.  @xref{Search and Replace, query-replace-map}.
+
 @item occur-mode-map
 @vindex occur-mode-map
 A sparse keymap used by Occur mode.
@@ -218,6 +222,10 @@ commands; also for @code{y-or-n-p} and @code{map-y-or-n-p}.  The functions
 that use this map do not support prefix keys; they look up one event at a
 time.
 
+@item search-map
+A sparse keymap that provides global bindings for search-related
+commands.
+
 @item text-mode-map
 @vindex text-mode-map
 A sparse keymap used by Text mode.
@@ -229,7 +237,3 @@ The keymap defining the contents of the tool bar.
 @vindex view-mode-map
 A full keymap used by View mode.
 @end table
-
-@ignore
-   arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
-@end ignore