diff options
author | Glenn Morris <[email protected]> | 2013-02-12 20:26:43 -0800 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2013-02-12 20:26:43 -0800 |
commit | 1a359750bbac95fd6bf8fe1233e747a1d26f0082 (patch) | |
tree | af3fc14500ea57cd37c7921d10c90ecc2bb706ee | |
parent | b6c3e4b12030bf05d5b797ba57531559340a9fd5 (diff) |
* src/keyboard.c (input-decode-map, key-translation-map): Doc fixes.
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/keyboard.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d798c933b6..62d33e15ec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Glenn Morris <[email protected]> + + * keyboard.c (input-decode-map, key-translation-map): Doc fixes. + 2013-02-12 Paul Eggert <[email protected]> Improve AIX port some more (Bug#13650). diff --git a/src/keyboard.c b/src/keyboard.c index 57dbf37f22..47d8780263 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11902,9 +11902,7 @@ If the binding is a function, it is called with one argument (the prompt) and its return value (a key sequence) is used. The events that come from bindings in `input-decode-map' are not -themselves looked up in `input-decode-map'. - -This variable is keyboard-local. */); +themselves looked up in `input-decode-map'. */); DEFVAR_LISP ("function-key-map", Vfunction_key_map, doc: /* The parent keymap of all `local-function-key-map' instances. @@ -11917,8 +11915,7 @@ definition will take precedence. */); DEFVAR_LISP ("key-translation-map", Vkey_translation_map, doc: /* Keymap of key translations that can override keymaps. This keymap works like `function-key-map', but comes after that, -and its non-prefix bindings override ordinary bindings. -Another difference is that it is global rather than keyboard-local. */); +and its non-prefix bindings override ordinary bindings. */); Vkey_translation_map = Fmake_sparse_keymap (Qnil); DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list, |