merge master

diff --cc configure.ac
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
index e3dd064c73262efc5a60cf22bb8ecadf052d9c6e,916276bc961426b454a932c729845e81870e956c..dc59cee097d66c0092571b331030897f9bb3c10e
--- 1/src/print.c
--- 2/src/print.c
+++ b/src/print.c
@@@ -1772,27 -1717,14 +1721,26 @@@ print_object (Lisp_Object obj, Lisp_Obj
        }
        else if (SUBRP (obj))
        {
-         strout ("#<subr ", -1, -1, printcharfun);
-         strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun);
-         PRINTCHAR ('>');
+         print_c_string ("#<subr ", printcharfun);
+         print_c_string (XSUBR (obj)->symbol_name, printcharfun);
+         printchar ('>', printcharfun);
        }
 +#ifdef HAVE_XWIDGETS
 +      else if (XWIDGETP (obj))
 +      {
 +        strout ("#<xwidget ", -1, -1, printcharfun);
 +        PRINTCHAR ('>');
 +      }
 +      else if (XWIDGET_VIEW_P (obj))
 +      {
 +        strout ("#<xwidget-view ", -1, -1, printcharfun);
 +        PRINTCHAR ('>');
 +      }
 +#endif
        else if (WINDOWP (obj))
        {
-         int len;
-         strout ("#<window ", -1, -1, printcharfun);
-         len = sprintf (buf, "%d", XWINDOW (obj)->sequence_number);
+         int len = sprintf (buf, "#<window %"pI"d",
+                            XWINDOW (obj)->sequence_number);
          strout (buf, len, len, printcharfun);
          if (BUFFERP (XWINDOW (obj)->contents))
            {

diff --cc src/window.c
index e1e91c074abed58c4e35d254fd855e25c38f6c82,0fcf82d43f4a93e62e54ae9d6bd72b1c95f68772..c04b435d1575eee140f5f12f289288630f617b68
--- 1/src/window.c
--- 2/src/window.c
+++ b/src/window.c
@@@ -44,32 -44,20 +44,23 @@@ along with GNU Emacs.  If not, see <htt
  #ifdef MSDOS
  #include "msdos.h"
  #endif
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
  
- static int displayed_window_lines (struct window *);
- static int count_windows (struct window *);
- static int get_leaf_windows (struct window *, struct window **, int);
- static void window_scroll (Lisp_Object, EMACS_INT, bool, int);
- static void window_scroll_pixel_based (Lisp_Object, int, bool, int);
- static void window_scroll_line_based (Lisp_Object, int, bool, int);
- static int add_window_to_list (struct window *, void *);
- static Lisp_Object next_window (Lisp_Object, Lisp_Object,
-                                 Lisp_Object, int);
- static void decode_next_window_args (Lisp_Object *, Lisp_Object *,
-                                      Lisp_Object *);
+ static ptrdiff_t count_windows (struct window *);
+ static ptrdiff_t get_leaf_windows (struct window *, struct window **,
+                                  ptrdiff_t);
+ static void window_scroll_pixel_based (Lisp_Object, int, bool, bool);
+ static void window_scroll_line_based (Lisp_Object, int, bool, bool);
  static void foreach_window (struct frame *,
-                                int (* fn) (struct window *, void *),
+                           bool (* fn) (struct window *, void *),
                              void *);
- static int foreach_window_1 (struct window *,
-                              int (* fn) (struct window *, void *),
-                              void *);
- static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
- static int window_resize_check (struct window *, bool);
+ static bool foreach_window_1 (struct window *,
+                             bool (* fn) (struct window *, void *),
+                             void *);
+ static bool window_resize_check (struct window *, bool);
  static void window_resize_apply (struct window *, bool);
- static void window_resize_apply_total (struct window *, bool);
- static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
  static void select_window_1 (Lisp_Object, bool);
  
  static struct window *set_window_fringes (struct window *, Lisp_Object,

diff --cc src/xterm.c
Simple merge