aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-02-12 20:26:43 -0800
committerGlenn Morris2013-02-12 20:26:43 -0800
commit1a359750bbac95fd6bf8fe1233e747a1d26f0082 (patch)
treeaf3fc14500ea57cd37c7921d10c90ecc2bb706ee /src
parentb6c3e4b12030bf05d5b797ba57531559340a9fd5 (diff)
downloademacs-1a359750bbac95fd6bf8fe1233e747a1d26f0082.tar.gz
emacs-1a359750bbac95fd6bf8fe1233e747a1d26f0082.zip
* src/keyboard.c (input-decode-map, key-translation-map): Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d798c933b6d..62d33e15ece 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-02-13 Glenn Morris <rgm@gnu.org>
2
3 * keyboard.c (input-decode-map, key-translation-map): Doc fixes.
4
12013-02-12 Paul Eggert <eggert@cs.ucla.edu> 52013-02-12 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Improve AIX port some more (Bug#13650). 7 Improve AIX port some more (Bug#13650).
diff --git a/src/keyboard.c b/src/keyboard.c
index 57dbf37f22a..47d87802632 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)
11902and its return value (a key sequence) is used. 11902and its return value (a key sequence) is used.
11903 11903
11904The events that come from bindings in `input-decode-map' are not 11904The events that come from bindings in `input-decode-map' are not
11905themselves looked up in `input-decode-map'. 11905themselves looked up in `input-decode-map'. */);
11906
11907This variable is keyboard-local. */);
11908 11906
11909 DEFVAR_LISP ("function-key-map", Vfunction_key_map, 11907 DEFVAR_LISP ("function-key-map", Vfunction_key_map,
11910 doc: /* The parent keymap of all `local-function-key-map' instances. 11908 doc: /* The parent keymap of all `local-function-key-map' instances.
@@ -11917,8 +11915,7 @@ definition will take precedence. */);
11917 DEFVAR_LISP ("key-translation-map", Vkey_translation_map, 11915 DEFVAR_LISP ("key-translation-map", Vkey_translation_map,
11918 doc: /* Keymap of key translations that can override keymaps. 11916 doc: /* Keymap of key translations that can override keymaps.
11919This keymap works like `function-key-map', but comes after that, 11917This keymap works like `function-key-map', but comes after that,
11920and its non-prefix bindings override ordinary bindings. 11918and its non-prefix bindings override ordinary bindings. */);
11921Another difference is that it is global rather than keyboard-local. */);
11922 Vkey_translation_map = Fmake_sparse_keymap (Qnil); 11919 Vkey_translation_map = Fmake_sparse_keymap (Qnil);
11923 11920
11924 DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list, 11921 DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list,