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

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 460511c5792f6978004b86ae20ecfa4072309729..a2705e99c10f3782b209decaae99ab6e646520b1 100644 (file)
--- 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 038744fe3e3c7863816a5c695d51a8e1927b6c8c..88ab85a2ac78e31941f3e23d33ad04954f2ad0e7 100644 (file)
--- 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

diff --git a/etc/NEWS b/etc/NEWS
index 4d5ec0c0377592ec5d20aac83a00d4880e9de37a..5564fe01f8ebc390cd0655ea3c504fabff1fef56 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1674,12 +1674,15 @@ $TERM inherited by Emacs you will have to look inside initial-environment.
 for the first frame.  `window-system' is also now a function that
 takes a frame argument.
 
++++
 *** The `keyboard-translate-table' variable and the terminal and
 keyboard coding systems are now terminal-local.
 
+---
 *** You can specify a terminal device (`tty' parameter) and a terminal
 type (`tty-type' parameter) to `make-terminal-frame'.
 
+---
 *** The function `make-frame-on-display' now works during a tty
 session.
 
@@ -1688,6 +1691,7 @@ session.
 The functions `get-device-terminal', `terminal-parameters',
 `terminal-parameter', `set-terminal-parameter' use this data type.
 
++++
 *** Function key sequences are now mapped using `local-function-key-map',
 a new variable.  This inherits from the global variable function-key-map,
 which is not used directly any more.