Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

diff --cc configure.ac
Simple merge

diff --cc lisp/desktop.el
Simple merge

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

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
index 68e4291272df1b19127e804b988780760ca76339,76432f8bb6b5c9971a7a9ea81975e7971da9860b..f02aa1d89a0cdaa64bdb4a953ebdb549177c8ce5
--- 1/src/window.c
--- 2/src/window.c
+++ b/src/window.c
@@@ -52,11 -52,11 +52,14 @@@ along with GNU Emacs.  If not, see <htt
  #ifdef HAVE_NS
  #include "nsterm.h"
  #endif
- Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_valid_p;
- static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
+ 
+ Lisp_Object Qwindowp, Qwindow_live_p;
+ static Lisp_Object Qwindow_valid_p;
+ static Lisp_Object Qwindow_configuration_p;
+ static Lisp_Object Qrecord_window_buffer;
  static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
  static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
  static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge