From: Joakim Verona <joakim@verona.se>
Date: Thu, 30 Jul 2015 16:31:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40919702dfbd91b5e48bf1d248447ad1e39063f1;p=emacs.git

Merge remote-tracking branch 'origin/master' into xwidget_mvp
---

40919702dfbd91b5e48bf1d248447ad1e39063f1
diff --cc src/keyboard.c
index 3ee039df0ed,6bd123c6710..8b4d9c3ba69
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@@ -4132,16 -4133,9 +4133,16 @@@ kbd_buffer_get_event (KBOARD **kbp
  #ifdef HAVE_DBUS
        else if (event->kind == DBUS_EVENT)
  	{
- 	  obj = make_lispy_event (event);
+ 	  obj = make_lispy_event (&event->ie);
  	  kbd_fetch_ptr = event + 1;
  	}
 +#endif
 +#ifdef HAVE_XWIDGETS
 +      else if (event->kind == XWIDGET_EVENT)
 +	{
 +	  obj = make_lispy_event (event);
 +	  kbd_fetch_ptr = event + 1;
 +	}
  #endif
        else if (event->kind == CONFIG_CHANGED_EVENT)
  	{