-

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/htmlfontify.el
Simple merge

diff --cc lisp/net/shr.el
Simple merge

diff --cc src/Makefile.in
index defce62c52959bb6bd44eed7b9899052c5048fc5,4a52757fec6e02956a0a4033d82c578352a3989e..b38e7d558b880cd85eaeb526ff85330107fcfb7c
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -359,9 -364,10 +365,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) \
    $(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/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index c8a9728e896bf891552cede1a9119a2aab901bb9,58831f548cad0091070ccc75b260ae3b9d0e8440..fe503b8ce566815070d0ada3efee05cb3f5a4e96
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -5950,7 -5957,15 +5957,14 @@@ 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/window.c
Simple merge

diff --cc test/manual/indent/ruby.rb
Simple merge