From: Joakim Verona <joakim@verona.se>
Date: Wed, 2 Dec 2015 22:07:40 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef9db71032e889af7a3189df164feb90e2b2ed3d;p=emacs.git

merge master
---

ef9db71032e889af7a3189df164feb90e2b2ed3d
diff --cc src/Makefile.in
index 859bc1bfe06,d7ad3954579..8a523bb3273
--- a/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/keyboard.c
index 92ef21ae058,ab7cb34a030..b36431e856f
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@@ -5952,15 -5945,7 +5952,15 @@@ make_lispy_event (struct input_event *e
        }
  #endif /* HAVE_DBUS */
  
 +#ifdef HAVE_XWIDGETS
 +    case XWIDGET_EVENT:
 +      {
 +        return Fcons (Qxwidget_event,event->arg);
 +      }
 +#endif
 +
 +
- #if defined HAVE_GFILENOTIFY || defined HAVE_INOTIFY
+ #if defined HAVE_INOTIFY || defined HAVE_KQUEUE || defined HAVE_GFILENOTIFY
      case FILE_NOTIFY_EVENT:
        {
          return Fcons (Qfile_notify, event->arg);