[Emacs-diffs] master 9a83ecb: Refer to local-function-key-map in various manuals

[Lars Ingebrigtsen]

branch: master
commit 9a83ecb60a0dd280fe892adfe3bbefd2d55d13bd
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Refer to local-function-key-map in various manuals
    
    * doc/misc/viper.texi (Key Bindings):
    * doc/misc/efaq.texi (X key translations for Emacs)
    (No Escape key):
    * doc/misc/edt.texi (Changes):
    * doc/emacs/msdos-xtra.texi (MS-DOS Keyboard):
    * doc/emacs/custom.texi (Terminal Init): Refer to
    local-function-key-map instead of function-key-map, since the
    latter isn't supposed to be changed (bug#27490).
---
 doc/emacs/custom.texi     | 2 +-
 doc/emacs/msdos-xtra.texi | 2 +-
 doc/misc/edt.texi         | 2 +-
 doc/misc/efaq.texi        | 6 +++---
 doc/misc/viper.texi       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index fae5433..aba9644 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2617,7 +2617,7 @@ kept.
   The usual purpose of the terminal-specific library is to map the
 escape sequences used by the terminal's function keys onto more
 meaningful names, using @code{input-decode-map} (or
-@code{function-key-map} before it).  See the file
+@code{local-function-key-map} before it).  See the file
 @file{term/lk201.el} for an example of how this is done.  Many function
 keys are mapped automatically according to the information in the
 Termcap data base; the terminal-specific library needs to map only the
diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index e0d3bcd..32cdcd4 100644
--- 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 function-key-map [kp-enter] [?\C-j])
+(define-key local-function-key-map [kp-enter] [?\C-j])
 @end smallexample
 
 @node MS-DOS Mouse
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 74224e9..73ec47d 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -190,7 +190,7 @@ key sequence, providing the @acronym{ASCII} key sequence 
prefix is
 already known by Emacs to be a prefix.  As a result of providing this
 support, some terminal/keyboard/window system configurations, which
 don't have a complete set of sensible function key bindings built into
-Emacs in @code{function-key-map}, can still be configured for use with
+Emacs in @code{local-function-key-map}, can still be configured for use with
 EDT Emulation.  (Note: In a few rare circumstances this does not work
 properly.  In particular, it does not work if a subset of the leading
 @acronym{ASCII} characters in a key sequence are recognized by Emacs as
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 485776e..fcc8e9f 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3887,10 +3887,10 @@ if you do build Emacs with Xt; please let us know if 
you've done this!)
 The only way to affect the behavior of keys within Emacs is through
 @code{xmodmap} (outside Emacs) or @code{define-key} (inside Emacs).  The
 @code{define-key} command should be used in conjunction with the
-@code{function-key-map} map.  For instance,
+@code{local-function-key-map} map.  For instance,
 
 @lisp
-(define-key function-key-map [M-@key{TAB}] [?\M-\t])
+(define-key local-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 function-key-map [f11] [?\e])
+(define-key local-function-key-map [f11] [?\e])
 @end lisp
 
 @node Compose Character
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 922c91b..2c3fc02 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -2185,7 +2185,7 @@ Manual}, and the Emacs quick reference card for the 
general info on key
 bindings in Emacs.
 
 @vindex input-decode-map
-@vindex function-key-map
+@vindex local-function-key-map
 @vindex viper-vi-global-user-map
 @vindex viper-insert-global-user-map
 @vindex viper-emacs-global-user-map