(Standard Keymaps): Rename function-key-map to local-function-key-map.

2 files changed, 18 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 460511c5792..a2705e99c10 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,20 @@
 2009-01-17  Eli Zaretskii  <eliz@gnu.org>
 
+        * maps.texi (Standard Keymaps): Rename function-key-map to
+        local-function-key-map.
+
+        * keymaps.texi (Translation Keymaps): Rename function-key-map to
+        local-function-key-map.
+
+        * nonascii.texi (Terminal I/O Encoding): `keyboard-coding-system'
+        and `set-keyboard-coding-system' now accept an optional terminal
+        argument.
+
+        * commands.texi (Event Mod): `keyboard-translate-table' is now
+        terminal-local.
+        (Function Keys): Rename function-key-map to
+        local-function-key-map.
+
         * elisp.texi (Top): Make @detailmenu be consistent with changes in
         frames.texi.
 
diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index 038744fe3e3..88ab85a2ac7 100644
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -112,7 +112,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 +163,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