aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-07-25 11:52:59 +0200
committerLars Ingebrigtsen2019-07-25 11:52:59 +0200
commita112547f91d8b4131ed01a05f15f22aa18b85a49 (patch)
treeca1e5e00617e8b60ea2d92267f2523f4392060ec
parent8a5a1bebfa95bf50ef390e4b101f1cfe8046d565 (diff)
downloademacs-a112547f91d8b4131ed01a05f15f22aa18b85a49.tar.gz
emacs-a112547f91d8b4131ed01a05f15f22aa18b85a49.zip
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.
-rw-r--r--doc/emacs/msdos-xtra.texi2
-rw-r--r--doc/lispref/keymaps.texi5
-rw-r--r--doc/misc/efaq.texi4
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 32cdcd4f9db..e0d3bcd4093 100644
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -105,7 +105,7 @@ following line into your @file{_emacs} file:
105 105
106@smallexample 106@smallexample
107;; @r{Make the @key{ENTER} key from the numeric keypad act as @kbd{C-j}.} 107;; @r{Make the @key{ENTER} key from the numeric keypad act as @kbd{C-j}.}
108(define-key local-function-key-map [kp-enter] [?\C-j]) 108(define-key function-key-map [kp-enter] [?\C-j])
109@end smallexample 109@end smallexample
110 110
111@node MS-DOS Mouse 111@node MS-DOS Mouse
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 6ad665a9502..b8eed0a501c 100644
--- 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.,
1614the remapping only applies if the original key sequence would 1614the remapping only applies if the original key sequence would
1615otherwise not have any binding. 1615otherwise not have any binding.
1616 1616
1617@code{local-function-key-map} inherits from @code{function-key-map}, 1617@code{local-function-key-map} inherits from @code{function-key-map}.
1618but the latter should not be used directly. 1618The latter should only be altered if you want the binding to apply in
1619all terminals, so using the former is almost always preferred.
1619@end defvar 1620@end defvar
1620 1621
1621@defvar key-translation-map 1622@defvar key-translation-map
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index fcc8e9f11ed..8fd3bf3a45e 100644
--- 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
3890@code{local-function-key-map} map. For instance, 3890@code{local-function-key-map} map. For instance,
3891 3891
3892@lisp 3892@lisp
3893(define-key local-function-key-map [M-@key{TAB}] [?\M-\t]) 3893(define-key function-key-map [M-@key{TAB}] [?\M-\t])
3894@end lisp 3894@end lisp
3895 3895
3896@noindent 3896@noindent
@@ -4099,7 +4099,7 @@ generates @key{ESC}. If not, the following form can be used to bind it:
4099 4099
4100@lisp 4100@lisp
4101;; F11 is the documented ESC replacement on DEC terminals. 4101;; F11 is the documented ESC replacement on DEC terminals.
4102(define-key local-function-key-map [f11] [?\e]) 4102(define-key function-key-map [f11] [?\e])
4103@end lisp 4103@end lisp
4104 4104
4105@node Compose Character 4105@node Compose Character