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

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 3ee039df0edd3f65707eab3cca7cb9079d5c45af,6bd123c67109358d669f70a814a0a2894ef31e1d..8b4d9c3ba690b8fa6726a6f9e7a456b4013e7f9a
--- 1/src/keyboard.c
--- 2/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)
        {

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge