Clarify in the manual when to use function-key-map

* doc/misc/efaq.texi (No Escape key):
* doc/emacs/msdos-xtra.texi (MS-DOS Keyboard): Change back to
function-key-map from local-function-key-map, because these
bindings apply to all terminals.

* doc/lispref/keymaps.texi (Translation Keymaps): Clarify in what
circumstances you may still want to use function-key-map.

diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 32cdcd4f9dbec2c6a33165e5a0ab6ebc82b4cfb1..e0d3bcd4093817ce528e67ceaf489d182bb083bc 100644 (file)
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -105,7 +105,7 @@ following line into your @file{_emacs} file:
 
 @smallexample
 ;; @r{Make the @key{ENTER} key from the numeric keypad act as @kbd{C-j}.}
-(define-key local-function-key-map [kp-enter] [?\C-j])
+(define-key function-key-map [kp-enter] [?\C-j])
 @end smallexample
 
 @node MS-DOS Mouse

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 6ad665a9502c47a1aa3ad263534af190ee0b6963..b8eed0a501c3b2f041fa90b3e7d0991941f256bc 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1614,8 +1614,9 @@ with bindings made in the minor mode, local, or global keymaps.  I.e.,
 the remapping only applies if the original key sequence would
 otherwise not have any binding.
 
-@code{local-function-key-map} inherits from @code{function-key-map},
-but the latter should not be used directly.
+@code{local-function-key-map} inherits from @code{function-key-map}.
+The latter should only be altered if you want the binding to apply in
+all terminals, so using the former is almost always preferred.
 @end defvar
 
 @defvar key-translation-map

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index fcc8e9f11edb91f1a3882db3c0c635257a94b8ba..8fd3bf3a45e8dafbbbd37a69f77f5df7eae02462 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3890,7 +3890,7 @@ The only way to affect the behavior of keys within Emacs is through
 @code{local-function-key-map} map.  For instance,
 
 @lisp
-(define-key local-function-key-map [M-@key{TAB}] [?\M-\t])
+(define-key function-key-map [M-@key{TAB}] [?\M-\t])
 @end lisp
 
 @noindent
@@ -4099,7 +4099,7 @@ generates @key{ESC}.  If not, the following form can be used to bind it:
 
 @lisp
 ;; F11 is the documented ESC replacement on DEC terminals.
-(define-key local-function-key-map [f11] [?\e])
+(define-key function-key-map [f11] [?\e])
 @end lisp
 
 @node Compose Character