[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget_mvp 3e73732 3/3: conflict in keyboard.c
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget_mvp 3e73732 3/3: conflict in keyboard.c |
Date: |
Fri, 11 Dec 2015 09:40:53 +0000 |
branch: xwidget_mvp
commit 3e73732ac1e52343a1886a7a3f786565118d6b80
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
conflict in keyboard.c
---
src/keyboard.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index b36431e..ec9dcaf 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