Mercurial > emacs

comparison src/keyboard.h @ 83346:7372c2f9daac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map. * src/keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to 'Vlocal_function_key_map', and 'Vkey_translation_map' to 'Vlocal_key_translation_map'. (Vfunction_key_map, Vkey_translation_map): New declarations. * src/keyboard.c (Vfunction_key_map): New variable. (Vglobal_key_translation_map): Rename to Vglobal_key_translation_map. (read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards): Update. * src/keymap.c (Fdescribe_buffer_bindings): Update. * src/term.c (term_get_fkeys_1): Update. * lisp/double.el (double-setup): Replace global-key-translation-map with key-translation-map. * lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto. * lisp/international/iso-transl.el: Ditto. * lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto. * lisp/edmacro.el (edmacro-format-keys): Use terminal-local binding of local-function-key-map instead of function-key-map. * lisp/emulation/cua-base.el (cua--pre-command-handler): Ditto. * lisp/isearch.el (isearch-other-meta-char): Ditto. * lisp/subr.el (read-quoted-char): Ditto. * lisp/term/vt200.el: Ditto. * lisp/term/vt201.el: Ditto. * lisp/term/vt220.el: Ditto. * lisp/term/vt240.el: Ditto. * lisp/term/vt300.el: Ditto. * lisp/term/vt320.el: Ditto. * lisp/term/vt400.el: Ditto. * lisp/term/vt420.el: Ditto. * lisp/simple.el (normal-erase-is-backspace-mode): Add todo note. * lisp/xt-mouse.el: Ditto. * lisp/term/AT386.el: Adapt for renaming of function-key-map to local-function-key-map. * lisp/term/internal.el: Ditto. * lisp/term/iris-ansi.el: Ditto. * lisp/term/lk201.el: Ditto. * lisp/term/mac-win.el: Ditto. * lisp/term/news.el: Ditto. * lisp/term/rxvt.el: Ditto. * lisp/term/sun.el: Ditto. * lisp/term/tvi970.el: Ditto. * lisp/term/wyse50.el: Ditto. * lisp/term/x-win.el (x-setup-function-keys): Ditto. * lisp/term/xterm.el: Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-386
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 12 Jul 2005 10:55:24 +0000
parents 9216636c02fc
children 532e0a9335a9
comparison
equal deleted inserted replaced
83345:817977e20b0d 83346:7372c2f9daac
121 Lisp_Object system_key_syms; 121 Lisp_Object system_key_syms;
122 122
123 /* Keymap mapping ASCII function key sequences onto their 123 /* Keymap mapping ASCII function key sequences onto their
124 preferred forms. Initialized by the terminal-specific lisp 124 preferred forms. Initialized by the terminal-specific lisp
125 files. See the DEFVAR for more documentation. */ 125 files. See the DEFVAR for more documentation. */
126 Lisp_Object Vfunction_key_map; 126 Lisp_Object Vlocal_function_key_map;
127 127
128 /* Keymap of key translations that can override keymaps. */ 128 /* Keymap of key translations that can override keymaps. */
129 Lisp_Object Vkey_translation_map; 129 Lisp_Object Vlocal_key_translation_map;
130 130
131 /* Minibufferless frames on this display use this frame's minibuffer. */ 131 /* Minibufferless frames on this display use this frame's minibuffer. */
132 Lisp_Object Vdefault_minibuffer_frame; 132 Lisp_Object Vdefault_minibuffer_frame;
133 133
134 /* Number of displays using this KBOARD. Normally 1, but can be 134 /* Number of displays using this KBOARD. Normally 1, but can be
302 extern Lisp_Object reorder_modifiers P_ ((Lisp_Object)); 302 extern Lisp_Object reorder_modifiers P_ ((Lisp_Object));
303 extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *)); 303 extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *));
304 /* User-supplied string to translate input characters through. */ 304 /* User-supplied string to translate input characters through. */
305 extern Lisp_Object Vkeyboard_translate_table; 305 extern Lisp_Object Vkeyboard_translate_table;
306 306
307 /* Parent keymap of terminal-local function-key-map instances. */
308 extern Lisp_Object Vfunction_key_map;
309
307 /* Parent keymap of terminal-local key-translation-map instances. */ 310 /* Parent keymap of terminal-local key-translation-map instances. */
308 extern Lisp_Object Vglobal_key_translation_map; 311 extern Lisp_Object Vkey_translation_map;
309 312
310 313
311 extern int parse_menu_item P_ ((Lisp_Object, int, int)); 314 extern int parse_menu_item P_ ((Lisp_Object, int, int));
312 315
313 extern void echo_now P_ ((void)); 316 extern void echo_now P_ ((void));