Mercurial > emacs

comparison src/keyboard.h @ 85106:fd282fb888de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 09 Oct 2007 05:05:39 +0000
parents 5b644ae74c91
children 5039706521c9
comparison
equal deleted inserted replaced
85105:ba4f1a829f83 85106:fd282fb888de
125 Lisp_Object Vsystem_key_alist; 125 Lisp_Object Vsystem_key_alist;
126 126
127 /* Cache for modify_event_symbol. */ 127 /* Cache for modify_event_symbol. */
128 Lisp_Object system_key_syms; 128 Lisp_Object system_key_syms;
129 129
130 /* Keymap mapping ASCII function key sequences onto their 130 /* Keymap mapping keys to alternative preferred forms.
131 preferred forms. Initialized by the terminal-specific lisp 131 See the DEFVAR for more documentation. */
132 files. See the DEFVAR for more documentation. */
133 Lisp_Object Vlocal_function_key_map; 132 Lisp_Object Vlocal_function_key_map;
134 133
135 /* Keymap of key translations that can override keymaps. */ 134 /* Keymap mapping ASCII function key sequences onto their preferred
136 Lisp_Object Vlocal_key_translation_map; 135 forms. Initialized by the terminal-specific lisp files. See the
137 136 DEFVAR for more documentation. */
137 Lisp_Object Vinput_decode_map;
138
138 /* Minibufferless frames on this display use this frame's minibuffer. */ 139 /* Minibufferless frames on this display use this frame's minibuffer. */
139 Lisp_Object Vdefault_minibuffer_frame; 140 Lisp_Object Vdefault_minibuffer_frame;
140 141
141 /* Number of displays using this KBOARD. Normally 1, but can be 142 /* Number of displays using this KBOARD. Normally 1, but can be
142 larger when you have multiple screens on a single X display. */ 143 larger when you have multiple screens on a single X display. */
312 313
313 314
314 /* Parent keymap of terminal-local function-key-map instances. */ 315 /* Parent keymap of terminal-local function-key-map instances. */
315 extern Lisp_Object Vfunction_key_map; 316 extern Lisp_Object Vfunction_key_map;
316 317
317 /* Parent keymap of terminal-local key-translation-map instances. */ 318 /* Keymap of key translations that can override keymaps. */
318 extern Lisp_Object Vkey_translation_map; 319 extern Lisp_Object Vkey_translation_map;
319 320
320 extern int parse_menu_item P_ ((Lisp_Object, int, int)); 321 extern int parse_menu_item P_ ((Lisp_Object, int, int));
321 322
322 extern void echo_now P_ ((void)); 323 extern void echo_now P_ ((void));