Mercurial > emacs

changeset 12176:3e14d94320f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(system_key_syms): Deleted; now part of struct kboard. (make_lispy_event): Use the struct member. (init_kboard): Initialize it. (syms_of_keyboard): Delete initialization and staticpro.
author Karl Heuer <kwzh@gnu.org>
date Fri, 09 Jun 1995 20:37:54 +0000
parents 4e36e9e99082
children ef0dcc3a18fd
files src/keyboard.c
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Fri Jun 09 20:37:32 1995 +0000
+++ b/src/keyboard.c	Fri Jun 09 20:37:54 1995 +0000
@@ -2711,7 +2711,6 @@
 
 /* Caches for modify_event_symbol.  */
 static Lisp_Object accent_key_syms;
-static Lisp_Object system_key_syms;
 static Lisp_Object func_key_syms;
 static Lisp_Object mouse_syms;
 
@@ -3003,13 +3002,14 @@
 	{
 	  /* We need to use an alist rather than a vector as the cache
 	     since we can't make a vector long enuf.  */
-	  if (NILP (system_key_syms))
-	    system_key_syms = Fcons (Qnil, Qnil);
+	  if (NILP (current_kboard->system_key_syms))
+	    current_kboard->system_key_syms = Fcons (Qnil, Qnil);
 	  return modify_event_symbol (event->code,
 				      event->modifiers,
 				      Qfunction_key,
 				      current_kboard->Vsystem_key_alist,
-				      0, &system_key_syms, (unsigned)-1);
+				      0, &current_kboard->system_key_syms,
+				      (unsigned)-1);
 	}
 
       return modify_event_symbol (event->code - 0xff00,
@@ -6624,6 +6624,7 @@
   kb->Vlast_kbd_macro = Qnil;
   kb->reference_count = 0;
   kb->Vsystem_key_alist = Qnil;
+  kb->system_key_syms = Qnil;
   kb->Vdefault_minibuffer_frame = Qnil;
 }
 
@@ -6871,9 +6872,6 @@
   func_key_syms = Qnil;
   staticpro (&func_key_syms);
 
-  system_key_syms = Qnil;
-  staticpro (&system_key_syms);
-
   mouse_syms = Qnil;
   staticpro (&mouse_syms);