diff options
| author | Stefan Monnier | 2007-10-09 05:05:39 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-09 05:05:39 +0000 |
| commit | 4f4a84ec801ea0d62d32a1b5679def1e16d3f813 (patch) | |
| tree | 86e671367bcef6d2b42e0a3ae0e1a83c32659f50 /src/keymap.c | |
| parent | beb9f7453ae9a4473cf43a16c186a090d77c4b3b (diff) | |
| download | emacs-4f4a84ec801ea0d62d32a1b5679def1e16d3f813.tar.gz emacs-4f4a84ec801ea0d62d32a1b5679def1e16d3f813.zip | |
Add new `input-decode-map' keymap and use it for temrinal
escape sequences.
* keyboard.h (struct kboard): Add Vinput_decode_map.
Remove Vlocal_key_translation_map.
* keyboard.c (read_key_sequence): Add support for input-decode-map.
(init_kboard): Init input-decode-map.
Replace local-key-translation-map back with key-translation-map.
(syms_of_keyboard): Declare input-decode-map.
Remove local-key-translation-map. Update docstrings.
(mark_kboards): Mark Vinput_decode_map.
Don't mark Vlocal_key_translation_map.
* keymap.c (Fdescribe_buffer_bindings): Describe input-decode-map.
Replace local-key-translation-map back with key-translation-map.
* term.c (term_get_fkeys_1, CONDITIONAL_REASSIGN):
Bind in input-decode-map rather than function-key-map.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 181d43a4f48..be23c20a3aa 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3027,8 +3027,8 @@ You type Translation\n\ | |||
| 3027 | insert ("\n", 1); | 3027 | insert ("\n", 1); |
| 3028 | } | 3028 | } |
| 3029 | 3029 | ||
| 3030 | if (!NILP (current_kboard->Vlocal_key_translation_map)) | 3030 | if (!NILP (Vkey_translation_map)) |
| 3031 | describe_map_tree (current_kboard->Vlocal_key_translation_map, 0, Qnil, prefix, | 3031 | describe_map_tree (Vkey_translation_map, 0, Qnil, prefix, |
| 3032 | "Key translations", nomenu, 1, 0, 0); | 3032 | "Key translations", nomenu, 1, 0, 0); |
| 3033 | 3033 | ||
| 3034 | 3034 | ||
| @@ -3121,6 +3121,11 @@ You type Translation\n\ | |||
| 3121 | describe_map_tree (current_kboard->Vlocal_function_key_map, 0, Qnil, prefix, | 3121 | describe_map_tree (current_kboard->Vlocal_function_key_map, 0, Qnil, prefix, |
| 3122 | "\f\nFunction key map translations", nomenu, 1, 0, 0); | 3122 | "\f\nFunction key map translations", nomenu, 1, 0, 0); |
| 3123 | 3123 | ||
| 3124 | /* Print the input-decode-map translations under this prefix. */ | ||
| 3125 | if (!NILP (current_kboard->Vinput_decode_map)) | ||
| 3126 | describe_map_tree (current_kboard->Vinput_decode_map, 0, Qnil, prefix, | ||
| 3127 | "\f\nInput decoding map translations", nomenu, 1, 0, 0); | ||
| 3128 | |||
| 3124 | UNGCPRO; | 3129 | UNGCPRO; |
| 3125 | return Qnil; | 3130 | return Qnil; |
| 3126 | } | 3131 | } |