aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-02-26 03:42:28 +0000
committerRichard M. Stallman1994-02-26 03:42:28 +0000
commit270a208f61272fb7bde87999ee8fb8c2e995cf19 (patch)
tree0d73921aa810742887f7aef688887788fefeb40c /src
parente009771e2e2622035b20880806a98bf10ed49e1c (diff)
downloademacs-270a208f61272fb7bde87999ee8fb8c2e995cf19.tar.gz
emacs-270a208f61272fb7bde87999ee8fb8c2e995cf19.zip
(Vsystem_key_alist): Renamed from Vvendor_key_alist.
(syms_of_keyboard): Rename Lisp var to system-key-alist.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 2ae4e763ebf..f9ba311624e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2168,11 +2168,11 @@ swallow_events ()
2168 2168
2169/* Caches for modify_event_symbol. */ 2169/* Caches for modify_event_symbol. */
2170static Lisp_Object accent_key_syms; 2170static Lisp_Object accent_key_syms;
2171static Lisp_Object vendor_key_syms; 2171static Lisp_Object system_key_syms;
2172static Lisp_Object func_key_syms; 2172static Lisp_Object func_key_syms;
2173static Lisp_Object mouse_syms; 2173static Lisp_Object mouse_syms;
2174 2174
2175Lisp_Object Vvendor_key_alist; 2175Lisp_Object Vsystem_key_alist;
2176 2176
2177/* This is a list of keysym codes for special "accent" characters. 2177/* This is a list of keysym codes for special "accent" characters.
2178 It parallels lispy_accent_keys. */ 2178 It parallels lispy_accent_keys. */
@@ -2452,17 +2452,17 @@ make_lispy_event (event)
2452 (sizeof (lispy_accent_keys) 2452 (sizeof (lispy_accent_keys)
2453 / sizeof (lispy_accent_keys[0]))); 2453 / sizeof (lispy_accent_keys[0])));
2454 2454
2455 /* Handle vendor-specific keysyms. */ 2455 /* Handle system-specific keysyms. */
2456 if (event->code & (1 << 28)) 2456 if (event->code & (1 << 28))
2457 { 2457 {
2458 /* We need to use an alist rather than a vector as the cache 2458 /* We need to use an alist rather than a vector as the cache
2459 since we can't make a vector long enuf. */ 2459 since we can't make a vector long enuf. */
2460 if (NILP (vendor_key_syms)) 2460 if (NILP (system_key_syms))
2461 vendor_key_syms = Fcons (Qnil, Qnil); 2461 system_key_syms = Fcons (Qnil, Qnil);
2462 return modify_event_symbol (event->code & 0xffffff, 2462 return modify_event_symbol (event->code & 0xffffff,
2463 event->modifiers, 2463 event->modifiers,
2464 Qfunction_key, Vvendor_key_alist, 2464 Qfunction_key, Vsystem_key_alist,
2465 0, &vendor_key_syms, 0xffffff); 2465 0, &system_key_syms, 0xffffff);
2466 } 2466 }
2467 2467
2468 return modify_event_symbol (event->code - 0xff00, 2468 return modify_event_symbol (event->code - 0xff00,
@@ -5906,10 +5906,10 @@ buffer's local map, and the minor mode keymaps and text property keymaps.");
5906 DEFVAR_BOOL ("track-mouse", &do_mouse_tracking, 5906 DEFVAR_BOOL ("track-mouse", &do_mouse_tracking,
5907 "*Non-nil means generate motion events for mouse motion."); 5907 "*Non-nil means generate motion events for mouse motion.");
5908 5908
5909 DEFVAR_LISP ("vendor-key-alist", &Vvendor_key_alist, 5909 DEFVAR_LISP ("system-key-alist", &Vsystem_key_alist,
5910 "Alist of vendor-specific X windows key symbols.\n\ 5910 "Alist of system-specific X windows key symbols.\n\
5911Each element should have the form (N . SYMBOL) where N is the\n\ 5911Each element should have the form (N . SYMBOL) where N is the\n\
5912numeric keysym code (sans the \"vendor-specific\" bit 1<<28)\n\ 5912numeric keysym code (sans the \"system-specific\" bit 1<<28)\n\
5913and SYMBOL is its name."); 5913and SYMBOL is its name.");
5914 Vmenu_bar_final_items = Qnil; 5914 Vmenu_bar_final_items = Qnil;
5915} 5915}