merge master

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.in
index 859bc1bfe063c404a8f91daf12e675213e26c3ff,d7ad3954579a635b9dba0b969572198ef7165c27..8a523bb32737c5e56797dee0be8cc95cf972a202
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -361,10 -354,9 +362,10 @@@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I
    $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
    $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
    $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \
 +  $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
-   $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
+   $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
    $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
  ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
  

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 92ef21ae058933fe34d63903d48a36d69402ff4a,ab7cb34a030f99de07d89795e1547bb66bed43c7..b36431e856f857fda4c4789e573a7608948f1c30
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -5952,15 -5945,7 +5952,15 @@@ make_lispy_event (struct input_event *e
        }
  #endif /* HAVE_DBUS */
  
- #if defined HAVE_GFILENOTIFY || defined HAVE_INOTIFY
 +#ifdef HAVE_XWIDGETS
 +    case XWIDGET_EVENT:
 +      {
 +        return Fcons (Qxwidget_event,event->arg);
 +      }
 +#endif
 +
 +
+ #if defined HAVE_INOTIFY || defined HAVE_KQUEUE || defined HAVE_GFILENOTIFY
      case FILE_NOTIFY_EVENT:
        {
          return Fcons (Qfile_notify, event->arg);

diff --cc src/lisp.h
Simple merge

diff --cc src/xterm.c
Simple merge