From: root <root@exodia.verona.se>
Date: Mon, 12 Aug 2013 10:27:22 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2870
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c39e73975f7371a6458cd63967d39ba77a1e871a;p=emacs.git

merge from trunk

Conflicts:
	src/Makefile.in
---

c39e73975f7371a6458cd63967d39ba77a1e871a
diff --cc src/Makefile.in
index c02b2c32d06,f0ed770ac8f..76a4e0c5703
--- a/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) \
 +	xwidget.o \
- 	profiler.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/emacsgtkfixed.c
index f675bd76d97,8b19d89f3a0..8635ab652ac
--- a/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