merge master, fix conflicts

diff --cc configure.ac
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
index 4da3350132397b44aabf1aaef088e1ae0f3b9897,1d2221fd9b22c9faf99654c5854a44c76cfb2c44..4dec9768e2ca3dbf4a1e2ba5d2b5cb045fd1bc1b
--- 1/src/window.c
--- 2/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);

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge