merge from upstream

diff --cc configure.in
Simple merge

diff --cc src/Makefile.in
index d1e212e92b7810381cda316bdb0e577e6f6e39ab,f68fa5c224001e50c178278aa4ccbfe12cf91a59..27ae6aff4dad4768abe503a00db36ebf8eccc945
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -311,8 -307,7 +313,10 @@@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MY
    $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
    $(C_SWITCH_X_SYSTEM) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
    $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
-   $(GCONF_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
++
 +  $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) \
+   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
++
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \
    $(LIBGNUTLS_CFLAGS) \
    $(C_WARNINGS_SWITCH) $(CFLAGS)
@@@ -389,11 -382,10 +393,11 @@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
  ## with GCC, we might need LIB_GCC again after them.
  LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(DBUS_LIBS) \
 +   $(WEBKIT_LIBS) $(CLUTTER_LIBS) \
     $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
-    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(GCONF_LIBS) $(LIBSELINUX_LIBS) \
+    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
     $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
-    $(LIBGNUTLS_LIBS) \
+    $(LIBGNUTLS_LIBS) $(LIB_PTHREAD_SIGMASK) \
     $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)
  
  all: emacs$(EXEEXT) $(OTHER_FILES)

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index 31506e2247b420dd35b926be40a708681e1cf6b6,69a66a4db64a5bb887f2b82da2acb02ef4d64263..c02de7225e108e736db3ca92ef898a76e2202c30
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -5127,11 -5368,8 +5399,11 @@@ pop_it (struct it *it
        it->object = p->u.image.object;
        it->slice = p->u.image.slice;
        break;
 +    case GET_FROM_XWIDGET:
 +      it->object = p->u.xwidget.object;
 +      break;
      case GET_FROM_STRETCH:
-       it->object = p->u.comp.object;
+       it->object = p->u.stretch.object;
        break;
      case GET_FROM_BUFFER:
        it->object = it->w->buffer;

diff --cc src/xfns.c
Simple merge