From: Joakim Verona <joakim@verona.se>
Date: Sun, 11 Jan 2015 17:40:21 +0000 (+0100)
Subject: merge master, fix conflicts
X-Git-Tag: emacs-25.0.90~2605
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc7cb20d6abc0f862e5513b24831bba0eaecaa5f;p=emacs.git

merge master, fix conflicts
---

cc7cb20d6abc0f862e5513b24831bba0eaecaa5f
diff --cc src/window.c
index 4da33501323,1d2221fd9b2..4dec9768e2c
--- a/src/window.c
+++ b/src/window.c
@@@ -44,24 -44,7 +44,10 @@@ along with GNU Emacs.  If not, see <htt
  #ifdef MSDOS
  #include "msdos.h"
  #endif
 +#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;
- static Lisp_Object Qwindow_sanitize_window_sizes;
- static Lisp_Object Qwindow_pixel_to_total;
- static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
- static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of;
- static Lisp_Object Qfloor, Qceiling;
- static Lisp_Object Qwindow_point_insertion_type;
- 
  static int displayed_window_lines (struct window *);
  static int count_windows (struct window *);
  static int get_leaf_windows (struct window *, struct window **, int);