merge from trunk

Conflicts:
	src/Makefile.in

diff --cc configure.ac
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc lisp/vc/vc-dir.el
Simple merge

diff --cc make-dist
Simple merge

diff --cc src/Makefile.in
index c02b2c32d06eef02913943436be4e540e067b2e4,f0ed770ac8fb9398530eeb9ebd3905d65978900b..76a4e0c570344df2222c69987d26ec92e9b34baa
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -381,8 -376,7 +383,8 @@@ base_obj = dispnew.o frame.o scroll.o x
        process.o gnutls.o callproc.o \
        region-cache.o sound.o atimer.o \
        doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
-       profiler.o \
 +      xwidget.o \
+       profiler.o decompress.o \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
        $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
  obj = $(base_obj) $(NS_OBJC_OBJ)

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/emacsgtkfixed.c
index f675bd76d971d25d01651e5dc331eead6a7011ac,8b19d89f3a0d78688b82e913c67e33a30c613ebb..8635ab652acfa635aabc83642c43f9ad9474369f
--- 1/src/emacsgtkfixed.c
--- 2/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -26,11 -26,9 +26,11 @@@ along with GNU Emacs.  If not, see <htt
  #include "lisp.h"
  #include "frame.h"
  #include "xterm.h"
 -
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
  /* Silence a bogus diagnostic; see GNOME bug 683906.  */
- #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+ #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__)
  # pragma GCC diagnostic push
  # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge