From: Joakim Verona <joakim@verona.se>
Date: Tue, 10 Sep 2013 21:26:38 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2700
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92aeabcc8a007f521a664e3aee092eb80ad0f49a;p=emacs.git

merge from trunk

Conflicts:
	src/dispnew.c
---

92aeabcc8a007f521a664e3aee092eb80ad0f49a
diff --cc .gitignore
index 1ee08d84907,1ee08d84907..50470179e38
--- a/.gitignore
+++ b/.gitignore
@@@ -10,10 -10,10 +10,12 @@@ lib/Makefile.i
  src/config.in
  autom4te.cache
  makefile
--TAGS
  *~
  /README.W32
  
  /bin/
  /site-lisp/
--/leim/ja-dic/
++*.o
++*.elc
++.bzr
++*#
diff --cc src/dispnew.c
index be518b18706,1c80facd422..096416db56e
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@@ -48,13 -49,6 +48,10 @@@ along with GNU Emacs.  If not, see <htt
  #include TERM_HEADER
  #endif /* HAVE_WINDOW_SYSTEM */
  
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
 +
- /* Include systime.h after xterm.h to avoid double inclusion of time.h.  */
- 
- #include "systime.h"
  #include <errno.h>
  
  #include <fpending.h>