]> git.eshelyaron.com Git - emacs.git/commitdiff
conflict in keyboard.c
authorJoakim Verona <joakim@verona.se>
Fri, 11 Dec 2015 09:39:59 +0000 (10:39 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 11 Dec 2015 09:39:59 +0000 (10:39 +0100)
src/keyboard.c

index b36431e856f857fda4c4789e573a7608948f1c30..ec9dcafac1966fa3aca1c903521fea0686f06e2a 100644 (file)
@@ -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