From: Joakim Verona <joakim@verona.se>
Date: Fri, 11 Dec 2015 09:39:59 +0000 (+0100)
Subject: conflict in keyboard.c
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e73732ac1e52343a1886a7a3f786565118d6b80;p=emacs.git

conflict in keyboard.c
---

diff --git a/src/keyboard.c b/src/keyboard.c
index b36431e856f..ec9dcafac19 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4012,7 +4012,7 @@ kbd_buffer_get_event (KBOARD **kbp,
 #ifdef HAVE_XWIDGETS
       else if (event->kind == XWIDGET_EVENT)
 	{
-	  obj = make_lispy_event (event);
+	  obj = make_lispy_event (&event->ie);
 	  kbd_fetch_ptr = event + 1;
 	}
 #endif