From: Joakim Verona <joakim@verona.se>
Date: Tue, 2 Jul 2013 20:46:17 +0000 (+0200)
Subject: Merge branch 'trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2893
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3718127221fbbc31f8ebd027ab7c95403dbe9118;p=emacs.git

Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c
---

3718127221fbbc31f8ebd027ab7c95403dbe9118
diff --cc src/window.c
index 68e4291272d,76432f8bb6b..f02aa1d89a0
--- a/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
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
- Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_valid_p;
- static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
+ 
+ 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;