Mercurial > emacs
changeset 11543:317e5825008b
(Vsystem_key_alist): Delete global variable.
(init_kboard): Initialize Vsystem_key_alist member.
(syms_of_keyboard): Change DEFVAR_LISP to DEFVAR_KBOARD.
(make_lispy_event): Use the kboard's alist instead of the global.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 24 Apr 1995 22:13:00 +0000 |
parents | 08bca45303e3 |
children | cc965273a769 |
files | src/keyboard.c |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Mon Apr 24 22:12:44 1995 +0000 +++ b/src/keyboard.c Mon Apr 24 22:13:00 1995 +0000 @@ -2699,8 +2699,6 @@ static Lisp_Object func_key_syms; static Lisp_Object mouse_syms; -Lisp_Object Vsystem_key_alist; - /* This is a list of keysym codes for special "accent" characters. It parallels lispy_accent_keys. */ @@ -2993,7 +2991,8 @@ system_key_syms = Fcons (Qnil, Qnil); return modify_event_symbol (event->code & 0xffffff, event->modifiers, - Qfunction_key, Vsystem_key_alist, + Qfunction_key, + current_kboard->Vsystem_key_alist, 0, &system_key_syms, 0xffffff); } @@ -6577,6 +6576,7 @@ kb->defining_kbd_macro = Qnil; kb->Vlast_kbd_macro = Qnil; kb->reference_count = 0; + kb->Vsystem_key_alist = Qnil; } /* @@ -7073,12 +7073,11 @@ "*Non-nil means generate motion events for mouse motion."); #endif - DEFVAR_LISP ("system-key-alist", &Vsystem_key_alist, + DEFVAR_KBOARD ("system-key-alist", Vsystem_key_alist, "Alist of system-specific X windows key symbols.\n\ Each element should have the form (N . SYMBOL) where N is the\n\ numeric keysym code (sans the \"system-specific\" bit 1<<28)\n\ and SYMBOL is its name."); - Vsystem_key_alist = Qnil; DEFVAR_LISP ("deferred-action-list", &Vdeferred_action_list, "List of deferred actions to be performed at a later time.\n\