merge from trunk

Conflicts:
	src/dispnew.c

diff --cc .gitignore
index 1ee08d849076cfc5291d8e291f0b166a9a37ed15,1ee08d849076cfc5291d8e291f0b166a9a37ed15..50470179e38594cc5edc67b0e9c3421acd5c35a3
--- 1/.gitignore
--- 2/.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/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
index be518b187067b8b09cab1efed07f5ecba34c196a,1c80facd4223f3e7b05584a9223410b81db7e8af..096416db56e32adf214226a3c8b85f3be2958556
--- 1/src/dispnew.c
--- 2/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 */
  
- /* Include systime.h after xterm.h to avoid double inclusion of time.h.  */
- 
- #include "systime.h"
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
 +
  #include <errno.h>
  
  #include <fpending.h>

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge