changeset 2842:ade0c13d91a3

[xemacs-hg @ 2005-07-03 21:47:59 by aidan] Move Qkey_mapping to general-slots.h.
author aidan
date Sun, 03 Jul 2005 21:48:01 +0000
parents b73c66cbc652
children c8e654c9a6b2
files src/ChangeLog src/event-Xt.c src/event-gtk.c src/events.c src/general-slots.h
diffstat 5 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jul 02 21:51:07 2005 +0000
+++ b/src/ChangeLog	Sun Jul 03 21:48:01 2005 +0000
@@ -1,3 +1,12 @@
+2005-07-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* event-Xt.c:
+	* event-gtk.c:
+	* events.c (event_to_character):
+	* general-slots.h:
+	Move the Qkey_mapping variable to general-slots.h, now that it's
+	used outside the platform specific keyboard warning code. 
+
 2005-06-28  Marcus Crestani  <crestani@xemacs.org>
 
 	* console-x.c (x_perhaps_init_unseen_key_defaults): Use
--- a/src/event-Xt.c	Sat Jul 02 21:51:07 2005 +0000
+++ b/src/event-Xt.c	Sun Jul 03 21:48:01 2005 +0000
@@ -127,7 +127,6 @@
 
 static int last_quit_check_signal_tick_count;
 
-Lisp_Object Qkey_mapping;
 Lisp_Object Qsans_modifiers;
 
 #define THIS_IS_X
@@ -3084,7 +3083,6 @@
 void
 syms_of_event_Xt (void)
 {
-  DEFSYMBOL (Qkey_mapping);
   DEFSYMBOL (Qsans_modifiers);
   DEFSYMBOL (Qself_insert_command);
 }
--- a/src/event-gtk.c	Sat Jul 02 21:51:07 2005 +0000
+++ b/src/event-gtk.c	Sun Jul 03 21:48:01 2005 +0000
@@ -94,7 +94,6 @@
 
 static int last_quit_check_signal_tick_count;
 
-Lisp_Object Qkey_mapping;
 Lisp_Object Qsans_modifiers;
 
 /*
@@ -1627,7 +1626,6 @@
 void
 syms_of_event_gtk (void)
 {
-  DEFSYMBOL (Qkey_mapping);
   DEFSYMBOL (Qsans_modifiers);
 }
 
--- a/src/events.c	Sat Jul 02 21:51:07 2005 +0000
+++ b/src/events.c	Sun Jul 03 21:48:01 2005 +0000
@@ -1340,8 +1340,6 @@
 
       if (CHAR_OR_CHAR_INTP (code = Fget (thekeysym, Qascii_character, Qnil)))
 	{
-	  extern Lisp_Object Qkey_mapping;
-
 	  c = XCHAR_OR_CHAR_INT (code);
 	  warn_when_safe(Qkey_mapping, Qwarning, 
 			 "Obsolete key binding technique.\n"
--- a/src/general-slots.h	Sat Jul 02 21:51:07 2005 +0000
+++ b/src/general-slots.h	Sun Jul 03 21:48:01 2005 +0000
@@ -169,6 +169,7 @@
 SYMBOL_KEYWORD (Q_horizontally_justify);
 SYMBOL (Qkey);
 SYMBOL (Qkey_assoc);
+SYMBOL (Qkey_mapping);
 SYMBOL_KEYWORD (Q_key_sequence);
 SYMBOL (Qkeyboard);
 SYMBOL (Qkeymap);