merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / src / keyboard.c

diff --git a/src/keyboard.c b/src/keyboard.c
index d53321306db95d24933d4abd5c4afac20bb96fa9..35fef638d8fcaa7a24bcff36adbe455197e9dc85 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -316,6 +316,7 @@ Lisp_Object Qsave_session;
 #ifdef HAVE_DBUS
 Lisp_Object Qdbus_event;
 #endif
+Lisp_Object Qxwidget_event;
 Lisp_Object Qconfig_changed_event;
 
 /* Lisp_Object Qmouse_movement; - also an event header */
@@ -3956,7 +3957,7 @@ kbd_buffer_get_event (KBOARD **kbp,
          kbd_fetch_ptr = event + 1;
        }
 #endif
-      else if (event->kind == CONFIG_CHANGED_EVENT)
+      else if (event->kind == CONFIG_CHANGED_EVENT || event->kind == XWIDGET_EVENT)
        {
          obj = make_lispy_event (event);
          kbd_fetch_ptr = event + 1;
@@ -5834,6 +5835,8 @@ make_lispy_event (struct input_event *event)
        return apply_modifiers (event->modifiers, event->arg);
       return event->arg;
 
+
+      
     case USER_SIGNAL_EVENT:
       /* A user signal.  */
       {
@@ -5852,6 +5855,11 @@ make_lispy_event (struct input_event *event)
        return Fcons (Qdbus_event, event->arg);
       }
 #endif /* HAVE_DBUS */
+    case XWIDGET_EVENT:
+      {
+        printf("cool, an xwidget event arrived in make_lispy_event!\n");
+        return  Fcons (Qxwidget_event,event->arg);
+      }
 
     case CONFIG_CHANGED_EVENT:
        return Fcons (Qconfig_changed_event,
@@ -11470,6 +11478,11 @@ syms_of_keyboard (void)
   staticpro (&Qdbus_event);
 #endif
 
+  Qxwidget_event = intern ("xwidget-event");
+  staticpro (&Qxwidget_event);
+
+  
+  Qmenu_enable = intern ("menu-enable");
   Qconfig_changed_event = intern_c_string ("config-changed-event");
   staticpro (&Qconfig_changed_event);