From 3e73732ac1e52343a1886a7a3f786565118d6b80 Mon Sep 17 00:00:00 2001
From: Joakim Verona <joakim@verona.se>
Date: Fri, 11 Dec 2015 10:39:59 +0100
Subject: [PATCH] conflict in keyboard.c

---
 src/keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.39.2