64 files changed, 1123 insertions, 668 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 288996fffb2..ce0455a4981 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,273 @@
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+        * w32.c (_PROCESS_MEMORY_COUNTERS_EX) [_WIN32_WINNT < 0x0500]:
+        Define only for _WIN32_WINNT less than 0x0500.
+        (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT) [!_W64]: Don't define for
+        MinGW64.
+        Move inclusion of time.h before sys/time.h, so that MinGW64 could
+        see its own definitions of 'struct timeval' and 'struct timezone'.
+        Fix incompatibilities between MinGW.org and MinGW64 headers.
+        * w32term.c (WCRANGE, GLYPHSET): Don't define if _W64 is defined.
+        * w32.c (REPARSE_DATA_BUFFER): Guard with
+        MAXIMUM_REPARSE_DATA_BUFFER_SIZE being defined.
+2013-03-25  Jan Djärv  <jan.h.d@swipnet.se>
+        * xterm.c: Include X11/XKBlib.h
+        (XTring_bell): Use XkbBell if HAVE_XKB (Bug#14041).
+2013-03-24  Andreas Schwab  <schwab@linux-m68k.org>
+        * alloc.c (xpalloc, Fgarbage_collect): Reorder conditions that are
+        written backwards.
+        * blockinput.h (input_blocked_p): Likewise.
+        * bytecode.c (exec_byte_code): Likewise.
+        * callproc.c (call_process_kill, call_process_cleanup)
+        (Fcall_process): Likewise.
+        * ccl.c (ccl_driver, resolve_symbol_ccl_program)
+        (Fccl_execute_on_string): Likewise.
+        * character.c (string_escape_byte8): Likewise.
+        * charset.c (read_hex): Likewise.
+        * cm.c (calccost): Likewise.
+        * data.c (cons_to_unsigned): Likewise.
+        * dired.c (directory_files_internal, file_name_completion):
+        Likewise.
+        * dispnew.c (scrolling_window, update_frame_1, Fsleep_for)
+        (sit_for): Likewise.
+        * doc.c (Fsubstitute_command_keys): Likewise.
+        * doprnt.c (doprnt): Likewise.
+        * editfns.c (hi_time, decode_time_components, Fformat): Likewise.
+        * emacsgtkfixed.c: Likewise.
+        * fileio.c (file_offset, Fwrite_region): Likewise.
+        * floatfns.c (Fexpt, fmod_float): Likewise.
+        * fns.c (larger_vector, make_hash_table, Fmake_hash_table):
+        Likewise.
+        * font.c (font_intern_prop): Likewise.
+        * frame.c (x_set_alpha): Likewise.
+        * gtkutil.c (get_utf8_string): Likewise.
+        * indent.c (check_display_width): Likewise.
+        * intervals.c (create_root_interval, rotate_right, rotate_left)
+        (split_interval_right, split_interval_left)
+        (adjust_intervals_for_insertion, delete_node)
+        (interval_deletion_adjustment, adjust_intervals_for_deletion)
+        (merge_interval_right, merge_interval_left, copy_intervals)
+        (set_intervals_multibyte_1): Likewise.
+        * keyboard.c (gobble_input, append_tool_bar_item): Likewise.
+        * keymap.c (Fkey_description): Likewise.
+        * lisp.h (FIXNUM_OVERFLOW_P, vcopy): Likewise.
+        * lread.c (openp, read_integer, read1, string_to_number):
+        Likewise.
+        * menu.c (ensure_menu_items): Likewise.
+        * minibuf.c (read_minibuf_noninteractive): Likewise.
+        * print.c (printchar, strout): Likewise.
+        * process.c (create_process, Faccept_process_output)
+        (wait_reading_process_output, read_process_output, send_process)
+        (wait_reading_process_output): Likewise.
+        * profiler.c (make_log, handle_profiler_signal): Likewise.
+        * regex.c (re_exec): Likewise.
+        * regex.h: Likewise.
+        * search.c (looking_at_1, Freplace_match): Likewise.
+        * sysdep.c (get_child_status, procfs_ttyname)
+        (procfs_get_total_memory): Likewise.
+        * systime.h (EMACS_TIME_VALID_P): Likewise.
+        * term.c (dissociate_if_controlling_tty): Likewise.
+        * window.c (get_phys_cursor_glyph): Likewise.
+        * xdisp.c (init_iterator, redisplay_internal, redisplay_window)
+        (try_window_reusing_current_matrix, try_window_id, pint2hrstr):
+        Likewise.
+        * xfns.c (Fx_window_property): Likewise.
+        * xmenu.c (set_frame_menubar): Likewise.
+        * xselect.c (x_get_window_property, x_handle_dnd_message):
+        Likewise.
+        * xsmfns.c (smc_save_yourself_CB): Likewise.
+        * xterm.c (x_scroll_bar_set_handle): Likewise.
+2013-03-24  Dmitry Antipov  <dmantipov@yandex.ru>
+        * xfaces.c (Finternal_face_x_get_resource): Allow 3rd (frame) argument
+        to be optional or nil.  Adjust comment and convert it to docstring.
+        * xselect.c (Fx_send_client_event): Rename to Fx_send_client_message.
+        * frame.c (display_x_get_resource, Fx_get_resource): Break long line.
+2013-03-24  Paul Eggert  <eggert@cs.ucla.edu>
+        Static checking by GCC 4.8-20130319.
+        * image.c (gif_load): Assume pass < 3 to pacify GCC.
+        * process.c (Fset_process_datagram_address)
+        (Fmake_network_process): Check get_lisp_to_sockaddr_size return value.
+        * xdisp.c (get_char_face_and_encoding):
+        (get_glyph_face_and_encoding): Ensure that *CHAR2B is initialized.
+        (get_glyph_face_and_encoding): Prepare face before possibly using it.
+        (get_per_char_metric): Don't use CHAR2B if it might not be initialized.
+2013-03-24  Ken Brown  <kbrown@cornell.edu>
+        * w32fns.c (emacs_abort) [CYGWIN]: Define `_open' as a macro to
+        fix compilation on 64-bit Cygwin, where underscores are not
+        automatically prepended.
+        * w32term.c (w32_initialize): Silence compiler warning.
+2013-03-23  Eli Zaretskii  <eliz@gnu.org>
+        * w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH,
+        FRAME_NORMAL_HEIGHT, and FRAME_PREV_FSMODE, instead of static
+        variables, to save and restore frame dimensions.  Use
+        FRAME_NORMAL_LEFT and FRAME_NORMAL_TOP to restore frame position
+        after returning from a 'fullscreen' configuration.  use
+        SendMessage instead of PostMessage to send the SC_RESTORE message,
+        to avoid races between the main thread and the input thread.
+        * w32term.h (struct w32_output): New members normal_width,
+        normal_height, normal_top, normal_left, and prev_fsmode.
+        (FRAME_NORMAL_WIDTH, FRAME_NORMAL_HEIGHT, FRAME_NORMAL_TOP)
+        (FRAME_NORMAL_LEFT, FRAME_PREV_FSMODE): New macros to access these
+        members of a frame.
+        * w32term.c (w32fullscreen_hook): Record last value of the frame's
+        'fullscreen' parameter.  Always record previous width and height
+        of the frame, except when switching out of maximized modes, so
+        that they could be restored correctly, instead of resetting to the
+        default frame dimensions.  Send SC_RESTORE command to the frame,
+        unless we are going to send SC_MAXIMIZE, to restore the frame
+        resize hints in the mouse pointer shown by the window manager.
+        (Bug#14032)
+        * frame.c (get_frame_param): Now extern for WINDOWSNT as well.
+        * lisp.h (get_frame_param): Adjust conditions for prototype
+        declaration.
+2013-03-22  Ken Brown  <kbrown@cornell.edu>
+        * unexcw.c: Drop unneeded inclusion of w32common.h.
+        (report_sheap_usage): Declare.
+        (read_exe_header): Add magic numbers for x86_64.
+        (fixup_executable): Fix printf format specifier for unsigned long
+        argument.
+2013-03-22  Dmitry Antipov  <dmantipov@yandex.ru>
+        * frame.h (struct frame): Put menu_bar_window under #ifdef
+        because this member is not needed when X toolkit is in use.
+        (fset_menu_bar_window):
+        * dispnew.c (clear_current_matrices, clear_desired_matrices)
+        (free_glyphs, update_frame):
+        * xdisp.c (expose_frame): Likewise.
+        (display_menu_bar): Likewise.  Remove redundant eassert.
+        * window.h (WINDOW_MENU_BAR_P): Always define to 0 if X
+        toolkit is in use.
+2013-03-21  Paul Eggert  <eggert@cs.ucla.edu>
+        Use functions and constants to manipulate Lisp_Save_Value objects.
+        This replaces code that used macros and strings and token-pasting.
+        The change makes the C source a bit easier to follow,
+        and shrinks the Emacs executable a bit.
+        * alloc.c: Verify some properties of Lisp_Save_Value's representation.
+        (make_save_value): Change 1st arg from string to enum.  All callers
+        changed.
+        (INTX): Remove.
+        (mark_object): Use if, not #if, for GC_MARK_STACK.
+        * lisp.h (SAVE_VALUEP, XSAVE_VALUE, XSAVE_POINTER, XSAVE_INTEGER)
+        (XSAVE_OBJECT): Now functions, not macros.
+        (STRING_BYTES_BOUND): Now just a macro, not a constant too;
+        the constant was never used.
+        (SAVE_SLOT_BITS, SAVE_VALUE_SLOTS, SAVE_TYPE_BITS, SAVE_TYPE_INT_INT)
+        (SAVE_TYPE_INT_INT_INT, SAVE_TYPE_OBJ_OBJ, SAVE_TYPE_OBJ_OBJ_OBJ)
+        (SAVE_TYPE_OBJ_OBJ_OBJ_OBJ, SAVE_TYPE_PTR_INT, SAVE_TYPE_PTR_OBJ)
+        (SAVE_TYPE_PTR_PTR, SAVE_TYPE_PTR_PTR_OBJ, SAVE_TYPE_MEMORY):
+        New constants.
+        (struct Lisp_Save_Value): Replace members area, type0, type1, type2,
+        type3 with a single member save_type.  All uses changed.
+        (save_type, set_save_pointer, set_save_integer): New functions.
+        * print.c (PRINTX): Remove.
+        * alloc.c: Remove redundant static declarations.
+2013-03-20  Dmitry Antipov  <dmantipov@yandex.ru>
+        * window.h (struct window): Convert left_col, top_line, total_lines
+        and total_cols from Lisp_Objects to integers.  Adjust comments.
+        (wset_left_col, wset_top_line, wset_total_cols, wset_total_lines):
+        Remove.
+        (WINDOW_TOTAL_COLS, WINDOW_TOTAL_LINES, WINDOW_LEFT_EDGE_COL)
+        (WINDOW_TOP_EDGE_LINE): Drop Lisp_Object to integer conversion.
+        * dispnew.c, frame.c, w32fns.c, window.c, xdisp.c, xfns.c:
+        Adjust users where appropriate.
+2013-03-20  Dmitry Antipov  <dmantipov@yandex.ru>
+        * frame.h (struct frame): Drop resx and resy because the same data is
+        available from window system-specific output context.  Adjust users.
+        (default_pixels_per_inch_x, default_pixels_per_inch_y): New
+        functions to provide defaults when no window system available.
+        (FRAME_RES_X, FRAME_RES_Y): New macros.
+        (NUMVAL): Moved from xdisp.c.
+        * font.c (font_pixel_size, font_find_for_lface, font_open_for_lface)
+        (Ffont_face_attributes, Fopen_font):
+        * image.c (gs_load):
+        * w32font.c (fill_in_logfont):
+        * xdisp.c (calc_pixel_width_or_height):
+        * xfaces.c (Fx_family_fonts, set_lface_from_font): Use them.
+        * xsettings.c (apply_xft_settings): Drop frame loop and adjust comment.
+2013-03-20  Kenichi Handa  <handa@gnu.org>
+        * coding.c (syms_of_coding): Initialize disable_ascii_optimization
+        to 1 (temporary workaround until a bug related to ASCII
+        optimization is fixed).
+2013-03-19  Dmitry Antipov  <dmantipov@yandex.ru>
+        * window.c (Fwindow_combination_limit, Fset_window_combination_limit):
+        Signal error if window is not internal.  Adjust docstring.
+        (delete_all_child_windows): Use combination_limit to save the buffer.
+        (Fset_window_configuration): Adjust accordingly.
+        * print.c (syms_of_print): Initialize debugging output not here...
+        (init_print_once): ...but in a new function here.
+        * lisp.h (init_print_once): Add prototype.
+        * emacs.c (main): Add call to init_print_once.  Adjust comments.
+2013-03-18  Dmitry Antipov  <dmantipov@yandex.ru>
+        * window.c (window_resize_check, window_resize_apply)
+        (window_from_coordinates, recombine_windows, set_window_buffer)
+        (make_parent_window, Fwindow_resize_apply, resize_frame_windows)
+        (Fsplit_window_internal, Fdelete_window_internal)
+        (freeze_window_starts): Use bool for booleans.
+        * window.h (window_frame_coordinates, resize_frame_windows)
+        (freeze_window_starts, set_window_buffer): Adjust prototypes.
+2013-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * dispnew.c (bitch_at_user): Use `user-error'.
+2013-03-17  Ken Brown  <kbrown@cornell.edu>
+        * dispextern.h (RGB_PIXEL_COLOR): Move here from image.c.  Use it
+        as return type of image_background.  (Bug#13981)
+        * image.c (RGB_PIXEL_COLOR): Move to dispextern.h.
+2013-03-16  Jan Djärv  <jan.h.d@swipnet.se>
+        * nsterm.m (updateFrameSize:): Change resize increments if needed.
+        (ns_select): Don't return with result uninitialized.
+        * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename
+        and getDirectory.
+        * nsfns.m (ns_filename_from_panel, ns_directory_from_panel):
+        New functions.
+        (Fns_read_file_name): ret is BOOL.  If ! dir_only_p, don't choose
+        directories.  If filename is nil, get directory name (Bug#13932).
+        Use getFilename and getDirectory.
+        (getFilename, getDirectory): New methods for EmacsSavePanel and
+        EmacsOpenPanel.
+        (ok:): In EmacsOpenPanel, if we can't choose directories, just return.
 2013-03-15  Paul Eggert  <eggert@cs.ucla.edu>
        * coding.c (decode_coding_gap): Fix typo caught by static checking.
@@ -23,10 +293,6 @@
        (syms_of_coding): Declare disable-ascii-optimization as a Lisp
        variable.
-        * global.h (struct emacs_globals): New member
-        f_disable_ascii_optimization.
-        (disable_ascii_optimization): New macro.
        * lisp.h (adjust_after_replace): Cancel externing it.
        (insert_from_gap): Adjust prototype.
@@ -5093,8 +5359,8 @@
        a public macro and no need to inline by hand.
 2012-09-26  Tomohiro Matsuyama  <tomo@cx4a.org>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
-            Juanma Barranquero  <lekktu@gmail.com>
+            Juanma Barranquero  <lekktu@gmail.com>
        * profiler.c: New file.
        * Makefile.in (base_obj): Add profiler.o.
diff --git a/src/alloc.c b/src/alloc.c
index b2703c5f961..ea833c62b94 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -323,20 +323,7 @@ static void *min_heap_address, *max_heap_address;
 static struct mem_node mem_z;
 #define MEM_NIL &mem_z
-static struct Lisp_Vector *allocate_vectorlike (ptrdiff_t);
-static void lisp_free (void *);
-static void mark_stack (void);
-static bool live_vector_p (struct mem_node *, void *);
-static bool live_buffer_p (struct mem_node *, void *);
-static bool live_string_p (struct mem_node *, void *);
-static bool live_cons_p (struct mem_node *, void *);
-static bool live_symbol_p (struct mem_node *, void *);
-static bool live_float_p (struct mem_node *, void *);
-static bool live_misc_p (struct mem_node *, void *);
-static void mark_maybe_object (Lisp_Object);
-static void mark_memory (void *, void *);
 #if GC_MARK_STACK || defined GC_MALLOC_CHECK
-static void mem_init (void);
 static struct mem_node *mem_insert (void *, void *, enum mem_type);
 static void mem_insert_fixup (struct mem_node *);
 static void mem_rotate_left (struct mem_node *);
@@ -346,11 +333,6 @@ static void mem_delete_fixup (struct mem_node *);
 static struct mem_node *mem_find (void *);
 #endif
-#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS
-static void check_gcpros (void);
-#endif
 #endif /* GC_MARK_STACK || GC_MALLOC_CHECK */
 #ifndef DEADP
@@ -797,7 +779,7 @@ xpalloc (void *pa, ptrdiff_t *nitems, ptrdiff_t nitems_incr_min,
  ptrdiff_t nitems_incr_max = n_max - n;
  ptrdiff_t incr = max (nitems_incr_min, min (incr_estimate, nitems_incr_max));
-  eassert (0 < item_size && 0 < nitems_incr_min && 0 <= n && -1 <= nitems_max);
+  eassert (item_size > 0 && nitems_incr_min > 0 && n >= 0 && nitems_max >= -1);
  if (! pa)
    *nitems = 0;
  if (nitems_incr_max < incr)
@@ -1162,7 +1144,7 @@ lisp_align_free (void *block)
 #define INTERVAL_BLOCK_SIZE \
  ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))
-/* Intervals are allocated in chunks in form of an interval_block
+/* Intervals are allocated in chunks in the form of an interval_block
   structure.  */
 struct interval_block
@@ -3344,56 +3326,50 @@ free_misc (Lisp_Object misc)
  total_free_markers++;
 }
+/* Verify properties of Lisp_Save_Value's representation
+   that are assumed here and elsewhere.  */
+verify (SAVE_UNUSED == 0);
+verify ((SAVE_INTEGER | SAVE_POINTER | SAVE_OBJECT) >> SAVE_SLOT_BITS == 0);
 /* Return a Lisp_Save_Value object with the data saved according to
-   FMT.  Format specifiers are `i' for an integer, `p' for a pointer
+   DATA_TYPE.  DATA_TYPE should be one of SAVE_TYPE_INT_INT, etc.  */
-   and `o' for Lisp_Object.  Up to 4 objects can be specified.  */
 Lisp_Object
-make_save_value (const char *fmt, ...)
+make_save_value (enum Lisp_Save_Type save_type, ...)
 {
  va_list ap;
-  int len = strlen (fmt);
+  int i;
  Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value);
  struct Lisp_Save_Value *p = XSAVE_VALUE (val);
-  eassert (0 < len && len < 5);
+  eassert (0 < save_type
-  va_start (ap, fmt);
+           && (save_type < 1 << (SAVE_TYPE_BITS - 1)
+               || save_type == SAVE_TYPE_MEMORY));
-#define INITX(index)                                           \
+  p->save_type = save_type;
-  do {                                                         \
+  va_start (ap, save_type);
-    if (len <= index)                                          \
+  save_type &= ~ (1 << (SAVE_TYPE_BITS - 1));
-      p->type ## index = SAVE_UNUSED;                          \
-    else                                                       \
+  for (i = 0; save_type; i++, save_type >>= SAVE_SLOT_BITS)
-      {                                                        \
+    switch (save_type & ((1 << SAVE_SLOT_BITS) - 1))
-        if (fmt[index] == 'i')                                 \
+      {
-         {                                                     \
+      case SAVE_POINTER:
-           p->type ## index = SAVE_INTEGER;                    \
+        p->data[i].pointer = va_arg (ap, void *);
-           p->data[index].integer = va_arg (ap, ptrdiff_t);    \
+        break;
-         }                                                     \
-       else if (fmt[index] == 'p')                             \
-         {                                                     \
-           p->type ## index = SAVE_POINTER;                    \
-           p->data[index].pointer = va_arg (ap, void *);       \
-         }                                                     \
-       else if (fmt[index] == 'o')                             \
-         {                                                     \
-           p->type ## index = SAVE_OBJECT;                     \
-           p->data[index].object = va_arg (ap, Lisp_Object);   \
-         }                                                     \
-       else                                                    \
-         emacs_abort ();                                       \
-      }                                                        \
-  } while (0)
-  INITX (0);
+      case SAVE_INTEGER:
-  INITX (1);
+        p->data[i].integer = va_arg (ap, ptrdiff_t);
-  INITX (2);
+        break;
-  INITX (3);
-#undef INITX
+      case SAVE_OBJECT:
+        p->data[i].object = va_arg (ap, Lisp_Object);
+        break;
+      default:
+        emacs_abort ();
+      }
  va_end (ap);
-  p->area = 0;
  return val;
 }
@@ -3404,11 +3380,8 @@ make_save_pointer (void *pointer)
 {
  Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value);
  struct Lisp_Save_Value *p = XSAVE_VALUE (val);
+  p->save_type = SAVE_POINTER;
-  p->area = 0;
-  p->type0 = SAVE_POINTER;
  p->data[0].pointer = pointer;
-  p->type1 = p->type2 = p->type3 = SAVE_UNUSED;
  return val;
 }
@@ -5403,7 +5376,7 @@ See Info node `(elisp)Garbage Collection'.  */)
      double tot = total_bytes_of_live_objects ();
      tot *= XFLOAT_DATA (Vgc_cons_percentage);
-      if (0 < tot)
+      if (tot > 0)
        {
          if (tot < TYPE_MAXIMUM (EMACS_INT))
            gc_relative_threshold = tot;
@@ -5976,12 +5949,11 @@ mark_object (Lisp_Object arg)
        case Lisp_Misc_Save_Value:
          XMISCANY (obj)->gcmarkbit = 1;
          {
-            register struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj);
+            struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj);
-            /* If `area' is nonzero, `data[0].pointer' is the address
+            /* If `save_type' is zero, `data[0].pointer' is the address
               of a memory area containing `data[1].integer' potential
               Lisp_Objects.  */
-#if GC_MARK_STACK
+            if (GC_MARK_STACK && ptr->save_type == SAVE_TYPE_MEMORY)
-            if (ptr->area)
              {
                Lisp_Object *p = ptr->data[0].pointer;
                ptrdiff_t nelt;
@@ -5989,17 +5961,12 @@ mark_object (Lisp_Object arg)
                  mark_maybe_object (*p);
              }
            else
-#endif /* GC_MARK_STACK */
              {
                /* Find Lisp_Objects in `data[N]' slots and mark them.  */
-                if (ptr->type0 == SAVE_OBJECT)
+                int i;
-                  mark_object (ptr->data[0].object);
+                for (i = 0; i < SAVE_VALUE_SLOTS; i++)
-                if (ptr->type1 == SAVE_OBJECT)
+                  if (save_type (ptr, i) == SAVE_OBJECT)
-                  mark_object (ptr->data[1].object);
+                    mark_object (ptr->data[i].object);
-                if (ptr->type2 == SAVE_OBJECT)
-                  mark_object (ptr->data[2].object);
-                if (ptr->type3 == SAVE_OBJECT)
-                  mark_object (ptr->data[3].object);
              }
          }
          break;
diff --git a/src/blockinput.h b/src/blockinput.h
index 192c813073d..6dc22c6f5dd 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -67,7 +67,7 @@ extern void unblock_input_to (int);
 BLOCKINPUT_INLINE bool
 input_blocked_p (void)
 {
-  return 0 < interrupt_input_blocked;
+  return interrupt_input_blocked > 0;
 }
 INLINE_HEADER_END
diff --git a/src/bytecode.c b/src/bytecode.c
index acb96c1e61b..7676c8550a4 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -660,7 +660,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
         the table clearer.  */
 #define LABEL(OP) [OP] = &&insn_ ## OP
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Woverride-init"
 #endif
@@ -676,7 +676,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 #undef DEFINE
        };
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 # pragma GCC diagnostic pop
 #endif
diff --git a/src/callproc.c b/src/callproc.c
index 9132c0dd976..46a37701a40 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,5 +1,5 @@
 /* Synchronous subprocess invocation for GNU Emacs.
-   Copyright (C) 1985-1988, 1993-1995, 1999-2012
+   Copyright (C) 1985-1988, 1993-1995, 1999-2013
                 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -125,7 +125,7 @@ record_kill_process (struct Lisp_Process *p)
 static Lisp_Object
 call_process_kill (Lisp_Object ignored)
 {
-  if (0 <= synch_process_fd)
+  if (synch_process_fd >= 0)
    emacs_close (synch_process_fd);
  if (synch_process_pid)
@@ -173,7 +173,7 @@ call_process_cleanup (Lisp_Object arg)
    }
 #endif
-  if (0 <= synch_process_fd)
+  if (synch_process_fd >= 0)
    emacs_close (synch_process_fd);
 #ifdef MSDOS
@@ -682,7 +682,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    child_errno = errno;
-    if (0 < pid)
+    if (pid > 0)
      {
        if (INTEGERP (buffer))
          record_deleted_pid (pid);
diff --git a/src/ccl.c b/src/ccl.c
index 7f77e1d22fa..c3b3f5486c4 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1668,7 +1668,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
                  }
                map = XCDR (map);
                if (! (VECTORP (map)
-                       && 0 < ASIZE (map)
+                       && ASIZE (map) > 0
                       && INTEGERP (AREF (map, 0))
                       && XINT (AREF (map, 0)) <= op
                       && op - XINT (AREF (map, 0)) + 1 < ASIZE (map)))
@@ -1867,7 +1867,7 @@ resolve_symbol_ccl_program (Lisp_Object ccl)
      return Qnil;
    }
-  if (! (0 <= XINT (AREF (result, CCL_HEADER_BUF_MAG))
+  if (! (XINT (AREF (result, CCL_HEADER_BUF_MAG)) >= 0
         && ASCENDING_ORDER (0, XINT (AREF (result, CCL_HEADER_EOF)),
                             ASIZE (ccl))))
    return Qnil;
@@ -2130,7 +2130,7 @@ usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBY
          produced_chars += ccl.produced;
          offset = outp - outbuf;
          shortfall = ccl.produced * max_expansion - (outbufsize - offset);
-          if (0 < shortfall)
+          if (shortfall > 0)
            {
              outbuf = xpalloc (outbuf, &outbufsize, shortfall, -1, 1);
              outp = outbuf + offset;
diff --git a/src/character.c b/src/character.c
index b2caaa290af..5a06c7f4d6c 100644
--- a/src/character.c
+++ b/src/character.c
@@ -833,8 +833,8 @@ string_escape_byte8 (Lisp_Object string)
  if (multibyte)
    {
-      if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count
+      if (byte8_count > (MOST_POSITIVE_FIXNUM - nchars) / 3
-          || (STRING_BYTES_BOUND - nbytes) / 2 < byte8_count)
+          || byte8_count > (STRING_BYTES_BOUND - nbytes) / 2)
        string_overflow ();
      /* Convert 2-byte sequence of byte8 chars to 4-byte octal.  */
@@ -843,7 +843,7 @@ string_escape_byte8 (Lisp_Object string)
    }
  else
    {
-      if ((STRING_BYTES_BOUND - nbytes) / 3 < byte8_count)
+      if (byte8_count > (STRING_BYTES_BOUND - nbytes) / 3)
        string_overflow ();
      /* Convert 1-byte sequence of byte8 chars to 4-byte octal.  */
diff --git a/src/charset.c b/src/charset.c
index fdb8eebde8b..3d43d81877f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -447,7 +447,7 @@ read_hex (FILE *fp, bool *eof, bool *overflow)
  n = 0;
  while (c_isxdigit (c = getc (fp)))
    {
-      if (UINT_MAX >> 4 < n)
+      if (n > UINT_MAX >> 4)
        *overflow = 1;
      n = ((n << 4)
           | (c - ('0' <= c && c <= '9' ? '0'
diff --git a/src/cm.c b/src/cm.c
index 3a5f927eda3..481ac15e435 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -214,7 +214,7 @@ calccost (struct tty_display_info *tty,
    if (doit)
      do
          emacs_tputs (tty, p, 1, cmputc);
-      while (0 < --deltay);
+      while (--deltay > 0);
 x:
    if ((deltax = dstx - srcx) == 0)
        goto done;
@@ -297,7 +297,7 @@ fail:
    if (doit)
      do
          emacs_tputs (tty, p, 1, cmputc);
-      while (0 < --deltax);
+      while (--deltax > 0);
 done:
    return totalcost;
 }
diff --git a/src/coding.c b/src/coding.c
index 6cfcec905a1..cb81375a043 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6075,7 +6075,7 @@ complement_process_encoding_system (Lisp_Object coding_system)
 static Lisp_Object adjust_coding_eol_type (struct coding_system *coding, int eol_seen);
-/* Return 1 if all the source bytes are ASCII, and return 0 otherwize.
+/* Return true iff all the source bytes are ASCII.
   By side effects, set coding->head_ascii and coding->eol_seen.  The
   value of coding->eol_seen is "logical or" of EOL_SEEN_LF,
   EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when
@@ -10877,7 +10877,7 @@ decode text as usual.  */);
  DEFVAR_BOOL ("disable-ascii-optimization", disable_ascii_optimization,
               doc: /* If non-nil, Emacs does not optimize code decoder for ASCII files.
 Internal use only.  Removed after the experimental optimizer gets stable. */);
-  disable_ascii_optimization = 0;
+  disable_ascii_optimization = 1;
  DEFVAR_LISP ("translation-table-for-input", Vtranslation_table_for_input,
               doc: /* Char table for translating self-inserting characters.
diff --git a/src/data.c b/src/data.c
index 6622088b648..b20d1b4c8af 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2337,13 +2337,13 @@ cons_to_unsigned (Lisp_Object c, uintmax_t max)
  uintmax_t val IF_LINT (= 0);
  if (INTEGERP (c))
    {
-      valid = 0 <= XINT (c);
+      valid = XINT (c) >= 0;
      val = XINT (c);
    }
  else if (FLOATP (c))
    {
      double d = XFLOAT_DATA (c);
-      if (0 <= d
+      if (d >= 0
          && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1))
        {
          val = d;
diff --git a/src/dired.c b/src/dired.c
index 0e37568f211..ab48488966b 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -258,7 +258,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
      QUIT;
      if (NILP (match)
-          || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0)))
+          || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0)
        wanted = 1;
      immediate_quit = 0;
@@ -517,8 +517,8 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
      QUIT;
      if (len < SCHARS (encoded_file)
-          || 0 <= scmp (dp->d_name, SSDATA (encoded_file),
+          || scmp (dp->d_name, SSDATA (encoded_file),
-                        SCHARS (encoded_file)))
+                   SCHARS (encoded_file)) >= 0)
        continue;
      if (file_name_completion_stat (fd, dp, &st) < 0)
@@ -580,7 +580,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
                    if (skip < 0)
                      continue;
-                    if (0 <= scmp (dp->d_name + skip, p1, elt_len))
+                    if (scmp (dp->d_name + skip, p1, elt_len) >= 0)
                      continue;
                    break;
                  }
@@ -602,9 +602,8 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
                    skip = len - SCHARS (elt);
                    if (skip < 0) continue;
-                    if (0 <= scmp (dp->d_name + skip,
+                    if (scmp (dp->d_name + skip, SSDATA (elt), SCHARS (elt))
-                                   SSDATA (elt),
+                        >= 0)
-                                   SCHARS (elt)))
                      continue;
                    break;
                  }
diff --git a/src/dispextern.h b/src/dispextern.h
index 58338587cac..9a03abf6766 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -609,8 +609,8 @@ struct glyph_pool
   2. Window glyph matrices on frames having frame glyph matrices.
   Such matrices are sub-matrices of their corresponding frame matrix,
-   i.e. frame glyph matrices and window glyph matrices share the same
+   i.e., frame glyph matrices and window glyph matrices share the same
-   glyph memory which is allocated in form of a glyph_pool structure.
+   glyph memory, which is allocated in the form of a glyph_pool structure.
   Glyph rows in such a window matrix are slices of frame matrix rows.
   2. Free-standing window glyph matrices managing their own glyph
@@ -3214,7 +3214,15 @@ bool valid_image_p (Lisp_Object);
 void prepare_image_for_display (struct frame *, struct image *);
 ptrdiff_t lookup_image (struct frame *, Lisp_Object);
-unsigned long image_background (struct image *, struct frame *,
+#if defined (HAVE_X_WINDOWS) ||  defined (HAVE_NS)
+#define RGB_PIXEL_COLOR unsigned long
+#endif
+#ifdef HAVE_NTGUI
+#define RGB_PIXEL_COLOR COLORREF
+#endif
+RGB_PIXEL_COLOR image_background (struct image *, struct frame *,
                                XImagePtr_or_DC ximg);
 int image_background_transparent (struct image *, struct frame *,
                                  XImagePtr_or_DC mask);
diff --git a/src/dispnew.c b/src/dispnew.c
index 763a01ab934..de1ca47ef60 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -365,7 +365,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
  if (NUMBERP (margin))
    {
-      int width = XFASTINT (w->total_cols);
+      int width = w->total_cols;
      double d = max (0, XFLOATINT (margin));
      d = min (width / 2 - 1, d);
      n = (int) ((double) total_glyphs / width * d);
@@ -796,11 +796,13 @@ clear_current_matrices (register struct frame *f)
  if (f->current_matrix)
    clear_glyph_matrix (f->current_matrix);
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  /* Clear the matrix of the menu bar window, if such a window exists.
     The menu bar window is currently used to display menus on X when
     no toolkit support is compiled in.  */
  if (WINDOWP (f->menu_bar_window))
    clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
+#endif
  /* Clear the matrix of the tool-bar window, if any.  */
  if (WINDOWP (f->tool_bar_window))
@@ -820,8 +822,10 @@ clear_desired_matrices (register struct frame *f)
  if (f->desired_matrix)
    clear_glyph_matrix (f->desired_matrix);
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  if (WINDOWP (f->menu_bar_window))
    clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix);
+#endif
  if (WINDOWP (f->tool_bar_window))
    clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix);
@@ -1778,7 +1782,7 @@ required_matrix_width (struct window *w)
    }
 #endif /* HAVE_WINDOW_SYSTEM */
-  return XINT (w->total_cols);
+  return w->total_cols;
 }
@@ -2116,10 +2120,10 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
    /* Set window dimensions to frame dimensions and allocate or
       adjust glyph matrices of W.  */
-    wset_top_line (w, make_number (0));
+    w->top_line = 0;
-    wset_left_col (w, make_number (0));
+    w->left_col = 0;
-    wset_total_lines (w, make_number (FRAME_MENU_BAR_LINES (f)));
+    w->total_lines = FRAME_MENU_BAR_LINES (f);
-    wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f)));
+    w->total_cols = FRAME_TOTAL_COLS (f);
    allocate_matrices_for_window_redisplay (w);
  }
 #endif /* not USE_X_TOOLKIT && not USE_GTK */
@@ -2142,10 +2146,10 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
    else
      w = XWINDOW (f->tool_bar_window);
-    wset_top_line (w, make_number (FRAME_MENU_BAR_LINES (f)));
+    w->top_line = FRAME_MENU_BAR_LINES (f);
-    wset_left_col (w, make_number (0));
+    w->left_col = 0;
-    wset_total_lines (w, make_number (FRAME_TOOL_BAR_LINES (f)));
+    w->total_lines = FRAME_TOOL_BAR_LINES (f);
-    wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f)));
+    w->total_cols = FRAME_TOTAL_COLS (f);
    allocate_matrices_for_window_redisplay (w);
  }
 #endif
@@ -2186,6 +2190,7 @@ free_glyphs (struct frame *f)
      if (!NILP (f->root_window))
        free_window_matrices (XWINDOW (f->root_window));
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
      /* Free the dummy window for menu bars without X toolkit and its
         glyph matrices.  */
      if (!NILP (f->menu_bar_window))
@@ -2196,6 +2201,7 @@ free_glyphs (struct frame *f)
          w->desired_matrix = w->current_matrix = NULL;
          fset_menu_bar_window (f, Qnil);
        }
+#endif
      /* Free the tool bar window and its glyph matrices.  */
      if (!NILP (f->tool_bar_window))
@@ -3094,10 +3100,12 @@ update_frame (struct frame *f, bool force_p, bool inhibit_hairy_id_p)
         when pending input is detected.  */
      update_begin (f);
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
      /* Update the menu bar on X frames that don't have toolkit
         support.  */
      if (WINDOWP (f->menu_bar_window))
        update_window (XWINDOW (f->menu_bar_window), 1);
+#endif
      /* Update the tool-bar window, if present.  */
      if (WINDOWP (f->tool_bar_window))
@@ -4462,7 +4470,7 @@ scrolling_window (struct window *w, bool header_line_p)
    row_table[row_entry_pool[i].bucket] = NULL;
  /* Value is 1 to indicate that we scrolled the display.  */
-  return 0 < nruns;
+  return nruns > 0;
 }
@@ -4548,7 +4556,7 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
        }
    }
-  lint_assume (0 <= FRAME_LINES (f));
+  lint_assume (FRAME_LINES (f) >= 0);
  pause_p = 0 < i && i < FRAME_LINES (f) - 1;
  /* Now just clean up termcap drivers and set cursor, etc.  */
@@ -5594,7 +5602,7 @@ change_frame_size_1 (struct frame *f, int newheight, int newwidth,
        FrameCols (FRAME_TTY (f)) = newwidth;
      if (WINDOWP (f->tool_bar_window))
-        wset_total_cols (XWINDOW (f->tool_bar_window), make_number (newwidth));
+        XWINDOW (f->tool_bar_window)->total_cols = newwidth;
    }
  FRAME_LINES (f) = newheight;
@@ -5736,7 +5744,11 @@ bitch_at_user (void)
  if (noninteractive)
    putchar (07);
  else if (!INTERACTIVE)  /* Stop executing a keyboard macro.  */
-    error ("Keyboard macro terminated by a command ringing the bell");
+    {
+      const char *msg
+        = "Keyboard macro terminated by a command ringing the bell";
+      Fsignal (Quser_error, Fcons (build_string (msg), Qnil));
+    }
  else
    ring_bell (XFRAME (selected_frame));
 }
@@ -5763,7 +5775,7 @@ additional wait period, in milliseconds; this is for backwards compatibility.
      duration += XINT (milliseconds) / 1000.0;
    }
-  if (0 < duration)
+  if (duration > 0)
    {
      EMACS_TIME t = EMACS_TIME_FROM_DOUBLE (duration);
      wait_reading_process_output (min (EMACS_SECS (t), WAIT_READING_MAX),
@@ -5803,14 +5815,14 @@ sit_for (Lisp_Object timeout, bool reading, int display_option)
  if (INTEGERP (timeout))
    {
      sec = XINT (timeout);
-      if (! (0 < sec))
+      if (sec <= 0)
        return Qt;
      nsec = 0;
    }
  else if (FLOATP (timeout))
    {
      double seconds = XFLOAT_DATA (timeout);
-      if (! (0 < seconds))
+      if (seconds <= 0)
        return Qt;
      else
        {
diff --git a/src/doc.c b/src/doc.c
index 7234fb38bf9..1ddaa117bba 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -826,7 +826,7 @@ Otherwise, return a new string, without any text properties.  */)
          if (NILP (tem))       /* but not on any keys */
            {
              ptrdiff_t offset = bufp - buf;
-              if (STRING_BYTES_BOUND - 4 < bsize)
+              if (bsize > STRING_BYTES_BOUND - 4)
                string_overflow ();
              buf = xrealloc (buf, bsize += 4);
              bufp = buf + offset;
diff --git a/src/doprnt.c b/src/doprnt.c
index 471e35c7b43..087256ced2a 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -361,7 +361,7 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
              /* Copy string into final output, truncating if no room.  */
            doit:
-              eassert (0 <= tem);
+              eassert (tem >= 0);
              /* Coming here means STRING contains ASCII only.  */
              if (STRING_BYTES_BOUND < tem)
                error ("Format width or precision too large");
diff --git a/src/editfns.c b/src/editfns.c
index f34c574cae3..2d87b8e0064 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -839,7 +839,7 @@ Lisp_Object
 save_excursion_save (void)
 {
  return make_save_value
-    ("oooo",
+    (SAVE_TYPE_OBJ_OBJ_OBJ_OBJ,
     Fpoint_marker (),
     /* Do not copy the mark if it points to nowhere.  */
     (XMARKER (BVAR (current_buffer, mark))->buffer
@@ -1398,8 +1398,8 @@ hi_time (time_t t)
     no runtime check is needed, and taking care not to convert
     negative numbers to unsigned before comparing them.  */
  if (! ((! TYPE_SIGNED (time_t)
-          || MOST_NEGATIVE_FIXNUM <= TIME_T_MIN >> 16
+          || TIME_T_MIN >> 16 >= MOST_NEGATIVE_FIXNUM
-          || MOST_NEGATIVE_FIXNUM <= hi)
+          || hi >= MOST_NEGATIVE_FIXNUM)
         && (TIME_T_MAX >> 16 <= MOST_POSITIVE_FIXNUM
             || hi <= MOST_POSITIVE_FIXNUM)))
    time_overflow ();
@@ -1561,7 +1561,7 @@ decode_time_components (Lisp_Object high, Lisp_Object low, Lisp_Object usec,
  if (result)
    {
-      if ((TYPE_SIGNED (time_t) ? TIME_T_MIN >> 16 <= hi : 0 <= hi)
+      if (hi >= (TYPE_SIGNED (time_t) ? TIME_T_MIN >> 16 : 0)
          && hi <= TIME_T_MAX >> 16)
        {
          /* Return the greatest representable time that is not greater
@@ -3958,7 +3958,7 @@ usage: (format STRING &rest OBJECTS)  */)
                   trailing "d").  */
                pMlen = sizeof pMd - 2
              };
-              verify (0 < USEFUL_PRECISION_MAX);
+              verify (USEFUL_PRECISION_MAX > 0);
              int prec;
              ptrdiff_t padding, sprintf_bytes;
@@ -4241,7 +4241,10 @@ usage: (format STRING &rest OBJECTS)  */)
            memcpy (buf, initial_buffer, used);
          }
        else
-          XSAVE_POINTER (buf_save_value, 0) = buf = xrealloc (buf, bufsize);
+          {
+            buf = xrealloc (buf, bufsize);
+            set_save_pointer (buf_save_value, 0, buf);
+          }
        p = buf + used;
      }
diff --git a/src/emacs.c b/src/emacs.c
index 31191dceb3e..e2889f1adf5 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1083,7 +1083,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
  noninteractive1 = noninteractive;
-/* Perform basic initializations (not merely interning symbols).  */
+  /* Perform basic initializations (not merely interning symbols).  */
  if (!initialized)
    {
@@ -1094,8 +1094,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
      init_coding_once ();
      init_syntax_once ();      /* Create standard syntax table.  */
      init_category_once ();    /* Create standard category table.  */
-                      /* Must be done before init_buffer.  */
+      init_casetab_once ();     /* Must be done before init_buffer_once.  */
-      init_casetab_once ();
      init_buffer_once ();      /* Create buffer table and some buffers.  */
      init_minibuf_once ();     /* Create list of minibuffers.  */
                                /* Must precede init_window_once.  */
@@ -1120,6 +1119,8 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
      syms_of_fileio ();
      /* Before syms_of_coding to initialize Vgc_cons_threshold.  */
      syms_of_alloc ();
+      /* May call Ffuncall and so GC, thus the latter should be initialized.  */
+      init_print_once ();
      /* Before syms_of_coding because it initializes Qcharsetp.  */
      syms_of_charset ();
      /* Before init_window_once, because it sets up the
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 9eedb57c81c..6df0b2422b1 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -30,7 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xwidget.h"
 #endif
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */
-#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif
diff --git a/src/fileio.c b/src/fileio.c
index 724250c8aaa..1919768d98a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3449,7 +3449,7 @@ file_offset (Lisp_Object val)
  if (FLOATP (val))
    {
      double v = XFLOAT_DATA (val);
-      if (0 <= v
+      if (v >= 0
          && (sizeof (off_t) < sizeof v
              ? v <= TYPE_MAXIMUM (off_t)
              : v < TYPE_MAXIMUM (off_t)))
@@ -4218,7 +4218,8 @@ by calling `format-decode', which see.  */)
               to be signaled after decoding the text we read.  */
            nbytes = internal_condition_case_1
              (read_non_regular,
-               make_save_value ("iii", (ptrdiff_t) fd, inserted, trytry),
+               make_save_value (SAVE_TYPE_INT_INT_INT, (ptrdiff_t) fd,
+                                inserted, trytry),
               Qerror, read_non_regular_quit);
            if (NILP (nbytes))
@@ -5012,7 +5013,7 @@ This calls `write-region-annotate-functions' at the start, and
      && ! (valid_timestamp_file_system && st.st_dev == timestamp_file_system))
    {
      int desc1 = emacs_open (fn, O_WRONLY | O_BINARY, 0);
-      if (0 <= desc1)
+      if (desc1 >= 0)
        {
          struct stat st1;
          if (fstat (desc1, &st1) == 0
diff --git a/src/floatfns.c b/src/floatfns.c
index 43576a16248..6113758f964 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -193,7 +193,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
  CHECK_NUMBER_OR_FLOAT (arg2);
  if (INTEGERP (arg1)     /* common lisp spec */
      && INTEGERP (arg2)   /* don't promote, if both are ints, and */
-      && 0 <= XINT (arg2)) /* we are sure the result is not fractional */
+      && XINT (arg2) >= 0) /* we are sure the result is not fractional */
    {                           /* this can be improved by pre-calculating */
      EMACS_INT y;              /* some binary powers of x then accumulating */
      EMACS_UINT acc, x;  /* Unsigned so that overflow is well defined.  */
@@ -475,7 +475,7 @@ fmod_float (Lisp_Object x, Lisp_Object y)
  f1 = fmod (f1, f2);
  /* If the "remainder" comes out with the wrong sign, fix it.  */
-  if (f2 < 0 ? 0 < f1 : f1 < 0)
+  if (f2 < 0 ? f1 > 0 : f1 < 0)
    f1 += f2;
  return make_float (f1);
diff --git a/src/fns.c b/src/fns.c
index b3a1dc2317a..82ce933b25d 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3409,7 +3409,7 @@ larger_vector (Lisp_Object vec, ptrdiff_t incr_min, ptrdiff_t nitems_max)
  ptrdiff_t n_max = (0 <= nitems_max && nitems_max < C_language_max
                     ? nitems_max : C_language_max);
  eassert (VECTORP (vec));
-  eassert (0 < incr_min && -1 <= nitems_max);
+  eassert (incr_min > 0 && nitems_max >= -1);
  old_size = ASIZE (vec);
  incr_max = n_max - old_size;
  incr = max (incr_min, min (old_size >> 1, incr_max));
@@ -3574,9 +3574,9 @@ make_hash_table (struct hash_table_test test,
  eassert (SYMBOLP (test.name));
  eassert (INTEGERP (size) && XINT (size) >= 0);
  eassert ((INTEGERP (rehash_size) && XINT (rehash_size) > 0)
-           || (FLOATP (rehash_size) && 1 < XFLOAT_DATA (rehash_size)));
+           || (FLOATP (rehash_size) && XFLOAT_DATA (rehash_size) > 1));
  eassert (FLOATP (rehash_threshold)
-           && 0 < XFLOAT_DATA (rehash_threshold)
+           && XFLOAT_DATA (rehash_threshold) > 0
           && XFLOAT_DATA (rehash_threshold) <= 1.0);
  if (XFASTINT (size) == 0)
@@ -4312,15 +4312,15 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* Look for `:rehash-size SIZE'.  */
  i = get_key_arg (QCrehash_size, nargs, args, used);
  rehash_size = i ? args[i] : make_float (DEFAULT_REHASH_SIZE);
-  if (! ((INTEGERP (rehash_size) && 0 < XINT (rehash_size))
+  if (! ((INTEGERP (rehash_size) && XINT (rehash_size) > 0)
-         || (FLOATP (rehash_size) && 1 < XFLOAT_DATA (rehash_size))))
+         || (FLOATP (rehash_size) && XFLOAT_DATA (rehash_size) > 1)))
    signal_error ("Invalid hash table rehash size", rehash_size);
  /* Look for `:rehash-threshold THRESHOLD'.  */
  i = get_key_arg (QCrehash_threshold, nargs, args, used);
  rehash_threshold = i ? args[i] : make_float (DEFAULT_REHASH_THRESHOLD);
  if (! (FLOATP (rehash_threshold)
-         && 0 < XFLOAT_DATA (rehash_threshold)
+         && XFLOAT_DATA (rehash_threshold) > 0
         && XFLOAT_DATA (rehash_threshold) <= 1))
    signal_error ("Invalid hash table rehash threshold", rehash_threshold);
diff --git a/src/font.c b/src/font.c
index db7bf352c94..357f8483b14 100644
--- a/src/font.c
+++ b/src/font.c
@@ -229,7 +229,7 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol)
  if (len == 1 && *str == '*')
    return Qnil;
-  if (!force_symbol && 0 < len && '0' <= *str && *str <= '9')
+  if (!force_symbol && len > 0 && '0' <= *str && *str <= '9')
    {
      for (i = 1; i < len; i++)
        if (! ('0' <= str[i] && str[i] <= '9'))
@@ -243,7 +243,7 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol)
            {
              if (i == len)
                return make_number (n);
-              if (MOST_POSITIVE_FIXNUM / 10 < n)
+              if (n > MOST_POSITIVE_FIXNUM / 10)
                break;
            }
@@ -287,7 +287,7 @@ font_pixel_size (FRAME_PTR f, Lisp_Object spec)
  if (INTEGERP (val))
    dpi = XINT (val);
  else
-    dpi = f->resy;
+    dpi = FRAME_RES_Y (f);
  pixel_size = POINT_TO_PIXEL (point_size, dpi);
  return pixel_size;
 #else
@@ -3117,7 +3117,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
    {
      double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
-      pixel_size = POINT_TO_PIXEL (pt / 10, f->resy);
+      pixel_size = POINT_TO_PIXEL (pt / 10, FRAME_RES_Y (f));
    }
  ASET (work, FONT_SIZE_INDEX, Qnil);
  foundry[0] = AREF (work, FONT_FOUNDRY_INDEX);
@@ -3247,12 +3247,13 @@ font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_O
            }
          pt /= 10;
-          size = POINT_TO_PIXEL (pt, f->resy);
+          size = POINT_TO_PIXEL (pt, FRAME_RES_Y (f));
 #ifdef HAVE_NS
          if (size == 0)
            {
              Lisp_Object ffsize = get_frame_param (f, Qfontsize);
-              size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0;
+              size = (NUMBERP (ffsize)
+                      ? POINT_TO_PIXEL (XINT (ffsize), FRAME_RES_Y (f)) : 0);
            }
 #endif
        }
@@ -4021,7 +4022,7 @@ are to be displayed on.  If omitted, the selected frame is used.  */)
  if (INTEGERP (val))
    {
      Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
-      int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : f->resy;
+      int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : FRAME_RES_Y (f);
      plist[n++] = QCheight;
      plist[n++] = make_number (PIXEL_TO_POINT (XINT (val) * 10, dpi));
    }
@@ -4532,7 +4533,7 @@ DEFUN ("open-font", Fopen_font, Sopen_font, 1, 3, 0,
    {
      CHECK_NUMBER_OR_FLOAT (size);
      if (FLOATP (size))
-        isize = POINT_TO_PIXEL (XFLOAT_DATA (size), f->resy);
+        isize = POINT_TO_PIXEL (XFLOAT_DATA (size), FRAME_RES_Y (f));
      else
        isize = XINT (size);
      if (! (INT_MIN <= isize && isize <= INT_MAX))
diff --git a/src/frame.c b/src/frame.c
index 0fa821682f3..cea39144cef 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -155,8 +155,8 @@ set_menu_bar_lines_1 (Lisp_Object window, int n)
  struct window *w = XWINDOW (window);
  w->last_modified = 0;
-  wset_top_line (w, make_number (XFASTINT (w->top_line) + n));
+  w->top_line += n;
-  wset_total_lines (w, make_number (XFASTINT (w->total_lines) - n));
+  w->total_lines -= n;
  /* Handle just the top child in a vertical split.  */
  if (!NILP (w->vchild))
@@ -332,14 +332,14 @@ make_frame (int mini_p)
  SET_FRAME_COLS (f, 10);
  FRAME_LINES (f) = 10;
-  wset_total_cols (XWINDOW (root_window), make_number (10));
+  XWINDOW (root_window)->total_cols = 10;
-  wset_total_lines (XWINDOW (root_window), make_number (mini_p ? 9 : 10));
+  XWINDOW (root_window)->total_lines = mini_p ? 9 : 10;
  if (mini_p)
    {
-      wset_total_cols (XWINDOW (mini_window), make_number (10));
+      XWINDOW (mini_window)->total_cols = 10;
-      wset_top_line (XWINDOW (mini_window), make_number (9));
+      XWINDOW (mini_window)->top_line = 9;
-      wset_total_lines (XWINDOW (mini_window), make_number (1));
+      XWINDOW (mini_window)->total_lines = 1;
    }
  /* Choose a buffer for the frame's root window.  */
@@ -1819,7 +1819,7 @@ See `redirect-frame-focus'.  */)
 /* Return the value of frame parameter PROP in frame FRAME.  */
 #ifdef HAVE_WINDOW_SYSTEM
-#if !HAVE_NS
+#if !HAVE_NS && !defined(WINDOWSNT)
 static
 #endif
 Lisp_Object
@@ -3315,13 +3315,13 @@ x_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
      else if (FLOATP (item))
        {
          alpha = XFLOAT_DATA (item);
-          if (alpha < 0.0 || 1.0 < alpha)
+          if (alpha < 0.0 || alpha > 1.0)
            args_out_of_range (make_float (0.0), make_float (1.0));
        }
      else if (INTEGERP (item))
        {
          EMACS_INT ialpha = XINT (item);
-          if (ialpha < 0 || 100 < ialpha)
+          if (ialpha < 0 || ialpha > 100)
            args_out_of_range (make_number (0), make_number (100));
          else
            alpha = ialpha / 100.0;
@@ -3495,7 +3495,8 @@ The optional arguments COMPONENT and SUBCLASS add to the key and the
 class, respectively.  You must specify both of them or neither.
 If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE'
 and the class is `Emacs.CLASS.SUBCLASS'.  */)
-  (Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass)
+  (Lisp_Object attribute, Lisp_Object class, Lisp_Object component,
+   Lisp_Object subclass)
 {
 #ifdef HAVE_X_WINDOWS
  check_x ();
@@ -3508,7 +3509,9 @@ and the class is `Emacs.CLASS.SUBCLASS'.  */)
 /* Get an X resource, like Fx_get_resource, but for display DPYINFO.  */
 Lisp_Object
-display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass)
+display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute,
+                        Lisp_Object class, Lisp_Object component,
+                        Lisp_Object subclass)
 {
  return xrdb_get_resource (dpyinfo->xrdb,
                            attribute, class, component, subclass);
diff --git a/src/frame.h b/src/frame.h
index c18b7662079..32a6954024e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -170,9 +170,11 @@ struct frame
     most recently buried buffer is first.  For last-buffer.  */
  Lisp_Object buried_buffer_list;
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  /* A dummy window used to display menu bars under X when no X
     toolkit support is available.  */
  Lisp_Object menu_bar_window;
+#endif
  /* A window used to display the tool-bar of a frame.  */
  Lisp_Object tool_bar_window;
@@ -276,9 +278,6 @@ struct frame
  /* Size of the frame window in pixels.  */
  int pixel_height, pixel_width;
-  /* Dots per inch of the screen the frame is on.  */
-  double resx, resy;
  /* These many pixels are the difference between the outer window (i.e. the
     left and top of the window manager decoration) and FRAME_X_WINDOW. */
  int x_pixels_diff, y_pixels_diff;
@@ -518,11 +517,13 @@ fset_menu_bar_vector (struct frame *f, Lisp_Object val)
 {
  f->menu_bar_vector = val;
 }
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 FRAME_INLINE void
 fset_menu_bar_window (struct frame *f, Lisp_Object val)
 {
  f->menu_bar_window = val;
 }
+#endif
 FRAME_INLINE void
 fset_name (struct frame *f, Lisp_Object val)
 {
@@ -569,6 +570,26 @@ fset_tool_bar_window (struct frame *f, Lisp_Object val)
  f->tool_bar_window = val;
 }
+#define NUMVAL(X) ((INTEGERP (X) || FLOATP (X)) ? XFLOATINT (X) : -1)
+FRAME_INLINE double
+default_pixels_per_inch_x (void)
+{
+  Lisp_Object v = (CONSP (Vdisplay_pixels_per_inch)
+                   ? XCAR (Vdisplay_pixels_per_inch)
+                   : Vdisplay_pixels_per_inch);
+  return NUMVAL (v) > 0 ? NUMVAL (v) : 72.0;
+}
+FRAME_INLINE double
+default_pixels_per_inch_y (void)
+{
+  Lisp_Object v = (CONSP (Vdisplay_pixels_per_inch)
+                   ? XCDR (Vdisplay_pixels_per_inch)
+                   : Vdisplay_pixels_per_inch);
+  return NUMVAL (v) > 0 ? NUMVAL (v) : 72.0;
+}
 #define FRAME_KBOARD(f) ((f)->terminal->kboard)
 /* Return a pointer to the image cache of frame F.  */
@@ -602,6 +623,37 @@ typedef struct frame *FRAME_PTR;
 #else
 #define FRAME_NS_P(f) ((f)->output_method == output_ns)
 #endif
+/* Dots per inch of the screen the frame F is on.  */
+#ifdef HAVE_X_WINDOWS
+#define FRAME_RES_X(f)                                          \
+  (eassert (FRAME_X_P (f)), FRAME_X_DISPLAY_INFO (f)->resx)
+#define FRAME_RES_Y(f)                                          \
+  (eassert (FRAME_X_P (f)), FRAME_X_DISPLAY_INFO (f)->resy)
+#endif
+#ifdef HAVE_NTGUI
+#define FRAME_RES_X(f)                                          \
+  (eassert (FRAME_W32_P (f)), FRAME_W32_DISPLAY_INFO (f)->resx)
+#define FRAME_RES_Y(f)                                          \
+  (eassert (FRAME_W32_P (f)), FRAME_W32_DISPLAY_INFO (f)->resy)
+#endif
+#ifdef HAVE_NS
+#define FRAME_RES_X(f)                                          \
+  (eassert (FRAME_NS_P (f)), FRAME_NS_DISPLAY_INFO (f)->resx)
+#define FRAME_RES_Y(f)                                          \
+  (eassert (FRAME_NS_P (f)), FRAME_NS_DISPLAY_INFO (f)->resy)
+#endif
+/* Defaults when no window system available.  */
+#ifndef FRAME_RES_X
+#define FRAME_RES_X(f) default_pixels_per_inch_x ()
+#define FRAME_RES_Y(f) default_pixels_per_inch_y ()
+#endif
 /* FRAME_WINDOW_P tests whether the frame is a window, and is
   defined to be the predicate for the window system being used.  */
diff --git a/src/ftfont.c b/src/ftfont.c
index 867e25a7a25..0ad173af98a 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -393,7 +393,7 @@ ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for)
      cache_data = xmalloc (sizeof *cache_data);
      cache_data->ft_face = NULL;
      cache_data->fc_charset = NULL;
-      val = make_save_value ("pi", cache_data, 0);
+      val = make_save_value (SAVE_TYPE_PTR_INT, cache_data, 0);
      cache = Fcons (Qnil, val);
      Fputhash (key, cache, ft_face_cache);
    }
@@ -1211,7 +1211,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
          return Qnil;
        }
    }
-  XSAVE_INTEGER (val, 1)++;
+  set_save_integer (val, 1, XSAVE_INTEGER (val, 1) + 1);
  size = XINT (AREF (entity, FONT_SIZE_INDEX));
  if (size == 0)
    size = pixel_size;
@@ -1326,7 +1326,7 @@ ftfont_close (FRAME_PTR f, struct font *font)
  cache = ftfont_lookup_cache (val, FTFONT_CACHE_FOR_FACE);
  eassert (CONSP (cache));
  val = XCDR (cache);
-  XSAVE_INTEGER (val, 1)--;
+  set_save_integer (val, 1, XSAVE_INTEGER (val, 1) - 1);
  if (XSAVE_INTEGER (val, 1) == 0)
    {
      struct ftfont_cache_data *cache_data = XSAVE_POINTER (val, 0);
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d6e4dcebcd3..2bb4305e1d2 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -543,7 +543,7 @@ get_utf8_string (const char *str)
      if (cp) g_free (cp);
      len = strlen (str);
-      if ((min (PTRDIFF_MAX, SIZE_MAX) - len - 1) / 4 < nr_bad)
+      if (nr_bad > (min (PTRDIFF_MAX, SIZE_MAX) - len - 1) / 4)
        memory_full (SIZE_MAX);
      up = utf8_str = xmalloc (len + nr_bad * 4 + 1);
      p = (unsigned char *)str;
diff --git a/src/image.c b/src/image.c
index 2d4e7e731ad..21f486176df 100644
--- a/src/image.c
+++ b/src/image.c
@@ -68,8 +68,6 @@ typedef struct x_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP None
-#define RGB_PIXEL_COLOR unsigned long
 #define PIX_MASK_RETAIN 0
 #define PIX_MASK_DRAW   1
 #endif /* HAVE_X_WINDOWS */
@@ -88,8 +86,6 @@ typedef struct w32_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
 #define NO_PIXMAP 0
-#define RGB_PIXEL_COLOR COLORREF
 #define PIX_MASK_RETAIN 0
 #define PIX_MASK_DRAW   1
@@ -110,7 +106,6 @@ typedef struct ns_bitmap_record Bitmap_Record;
 #define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP 0
-#define RGB_PIXEL_COLOR unsigned long
 #define ZPixmap 0
 #define PIX_MASK_RETAIN 0
@@ -159,15 +154,15 @@ XGetImage (Display *display, Pixmap pixmap, int x, int y,
  return pixmap;
 }
-/* use with imgs created by ns_image_for_XPM */
+/* Use with images created by ns_image_for_XPM.  */
 unsigned long
 XGetPixel (XImagePtr ximage, int x, int y)
 {
  return ns_get_pixel (ximage, x, y);
 }
-/* use with imgs created by ns_image_for_XPM; alpha set to 1;
+/* Use with images created by ns_image_for_XPM; alpha set to 1;
-   pixel is assumed to be in form RGB */
+   pixel is assumed to be in RGB form.  */
 void
 XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
 {
@@ -7378,11 +7373,10 @@ gif_load (struct frame *f, struct image *img)
               y < subimg_height;
               y++, row += interlace_increment[pass])
            {
-              if (row >= subimg_height)
+              while (subimg_height <= row)
                {
+                  lint_assume (pass < 3);
                  row = interlace_start[++pass];
-                  while (row >= subimg_height)
-                    row = interlace_start[++pass];
                }
              for (x = 0; x < subimg_width; x++)
@@ -8559,10 +8553,10 @@ gs_load (struct frame *f, struct image *img)
     info.  */
  pt_width = image_spec_value (img->spec, QCpt_width, NULL);
  in_width = INTEGERP (pt_width) ? XFASTINT (pt_width) / 72.0 : 0;
-  in_width *= FRAME_X_DISPLAY_INFO (f)->resx;
+  in_width *= FRAME_RES_X (f);
  pt_height = image_spec_value (img->spec, QCpt_height, NULL);
  in_height = INTEGERP (pt_height) ? XFASTINT (pt_height) / 72.0 : 0;
-  in_height *= FRAME_X_DISPLAY_INFO (f)->resy;
+  in_height *= FRAME_RES_Y (f);
  if (! (in_width <= INT_MAX && in_height <= INT_MAX
         && check_image_size (f, in_width, in_height)))
diff --git a/src/indent.c b/src/indent.c
index d1f95da6bcf..ac448532dd4 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -476,7 +476,7 @@ check_display_width (ptrdiff_t pos, ptrdiff_t col, ptrdiff_t *endpos)
      if ((prop = Fplist_get (plist, QCwidth),
           RANGED_INTEGERP (0, prop, INT_MAX)))
        width = XINT (prop);
-      else if (FLOATP (prop) && 0 <= XFLOAT_DATA (prop)
+      else if (FLOATP (prop) && XFLOAT_DATA (prop) >= 0
               && XFLOAT_DATA (prop) <= INT_MAX)
        width = (int)(XFLOAT_DATA (prop) + 0.5);
      else if ((prop = Fplist_get (plist, QCalign_to),
diff --git a/src/intervals.c b/src/intervals.c
index db38c86c00b..f65ce0ecc77 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -110,14 +110,14 @@ create_root_interval (Lisp_Object parent)
    {
      new->total_length = (BUF_Z (XBUFFER (parent))
                           - BUF_BEG (XBUFFER (parent)));
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
      set_buffer_intervals (XBUFFER (parent), new);
      new->position = BEG;
    }
  else if (STRINGP (parent))
    {
      new->total_length = SCHARS (parent);
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
      set_string_intervals (parent, new);
      new->position = 0;
    }
@@ -371,11 +371,11 @@ rotate_right (INTERVAL interval)
  /* A's total length is decreased by the length of B and its left child.  */
  interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval);
-  eassert (0 <= TOTAL_LENGTH (interval));
+  eassert (TOTAL_LENGTH (interval) >= 0);
  /* B must have the same total length of A.  */
  B->total_length = old_total;
-  eassert (0 <= TOTAL_LENGTH (B));
+  eassert (TOTAL_LENGTH (B) >= 0);
  return B;
 }
@@ -418,11 +418,11 @@ rotate_left (INTERVAL interval)
  /* A's total length is decreased by the length of B and its right child.  */
  interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval);
-  eassert (0 <= TOTAL_LENGTH (interval));
+  eassert (TOTAL_LENGTH (interval) >= 0);
  /* B must have the same total length of A.  */
  B->total_length = old_total;
-  eassert (0 <= TOTAL_LENGTH (B));
+  eassert (TOTAL_LENGTH (B) >= 0);
  return B;
 }
@@ -556,7 +556,7 @@ split_interval_right (INTERVAL interval, ptrdiff_t offset)
    {
      set_interval_right (interval, new);
      new->total_length = new_length;
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
    }
  else
    {
@@ -565,7 +565,7 @@ split_interval_right (INTERVAL interval, ptrdiff_t offset)
      set_interval_parent (interval->right, new);
      set_interval_right (interval, new);
      new->total_length = new_length + new->right->total_length;
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
      balance_an_interval (new);
    }
@@ -601,7 +601,7 @@ split_interval_left (INTERVAL interval, ptrdiff_t offset)
    {
      set_interval_left (interval, new);
      new->total_length = new_length;
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
    }
  else
    {
@@ -610,7 +610,7 @@ split_interval_left (INTERVAL interval, ptrdiff_t offset)
      set_interval_parent (new->left, new);
      set_interval_left (interval, new);
      new->total_length = new_length + new->left->total_length;
-      eassert (0 <= TOTAL_LENGTH (new));
+      eassert (TOTAL_LENGTH (new) >= 0);
      balance_an_interval (new);
    }
@@ -960,7 +960,7 @@ adjust_intervals_for_insertion (INTERVAL tree,
      for (temp = prev ? prev : i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
        {
          temp->total_length += length;
-          eassert (0 <= TOTAL_LENGTH (temp));
+          eassert (TOTAL_LENGTH (temp) >= 0);
          temp = balance_possible_root_interval (temp);
        }
@@ -1016,7 +1016,7 @@ adjust_intervals_for_insertion (INTERVAL tree,
      for (temp = i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
        {
          temp->total_length += length;
-          eassert (0 <= TOTAL_LENGTH (temp));
+          eassert (TOTAL_LENGTH (temp) >= 0);
          temp = balance_possible_root_interval (temp);
        }
    }
@@ -1218,7 +1218,7 @@ delete_node (register INTERVAL i)
      this = this->left;
      this->total_length += migrate_amt;
    }
-  eassert (0 <= TOTAL_LENGTH (this));
+  eassert (TOTAL_LENGTH (this) >= 0);
  set_interval_left (this, migrate);
  set_interval_parent (migrate, this);
@@ -1300,7 +1300,7 @@ interval_deletion_adjustment (register INTERVAL tree, register ptrdiff_t from,
                                                         relative_position,
                                                         amount);
      tree->total_length -= subtract;
-      eassert (0 <= TOTAL_LENGTH (tree));
+      eassert (TOTAL_LENGTH (tree) >= 0);
      return subtract;
    }
  /* Right branch.  */
@@ -1315,7 +1315,7 @@ interval_deletion_adjustment (register INTERVAL tree, register ptrdiff_t from,
                                               relative_position,
                                               amount);
      tree->total_length -= subtract;
-      eassert (0 <= TOTAL_LENGTH (tree));
+      eassert (TOTAL_LENGTH (tree) >= 0);
      return subtract;
    }
  /* Here -- this node.  */
@@ -1330,7 +1330,7 @@ interval_deletion_adjustment (register INTERVAL tree, register ptrdiff_t from,
        amount = my_amount;
      tree->total_length -= amount;
-      eassert (0 <= TOTAL_LENGTH (tree));
+      eassert (TOTAL_LENGTH (tree) >= 0);
      if (LENGTH (tree) == 0)
        delete_interval (tree);
@@ -1372,7 +1372,7 @@ adjust_intervals_for_deletion (struct buffer *buffer,
  if (ONLY_INTERVAL_P (tree))
    {
      tree->total_length -= length;
-      eassert (0 <= TOTAL_LENGTH (tree));
+      eassert (TOTAL_LENGTH (tree) >= 0);
      return;
    }
@@ -1435,19 +1435,19 @@ merge_interval_right (register INTERVAL i)
      while (! NULL_LEFT_CHILD (successor))
        {
          successor->total_length += absorb;
-          eassert (0 <= TOTAL_LENGTH (successor));
+          eassert (TOTAL_LENGTH (successor) >= 0);
          successor = successor->left;
        }
      successor->total_length += absorb;
-      eassert (0 <= TOTAL_LENGTH (successor));
+      eassert (TOTAL_LENGTH (successor) >= 0);
      delete_interval (i);
      return successor;
    }
  /* Zero out this interval.  */
  i->total_length -= absorb;
-  eassert (0 <= TOTAL_LENGTH (i));
+  eassert (TOTAL_LENGTH (i) >= 0);
  successor = i;
  while (! NULL_PARENT (successor))        /* It's above us.  Subtract as
@@ -1462,7 +1462,7 @@ merge_interval_right (register INTERVAL i)
      successor = INTERVAL_PARENT (successor);
      successor->total_length -= absorb;
-      eassert (0 <= TOTAL_LENGTH (successor));
+      eassert (TOTAL_LENGTH (successor) >= 0);
    }
  /* This must be the rightmost or last interval and cannot
@@ -1491,19 +1491,19 @@ merge_interval_left (register INTERVAL i)
      while (! NULL_RIGHT_CHILD (predecessor))
        {
          predecessor->total_length += absorb;
-          eassert (0 <= TOTAL_LENGTH (predecessor));
+          eassert (TOTAL_LENGTH (predecessor) >= 0);
          predecessor = predecessor->right;
        }
      predecessor->total_length += absorb;
-      eassert (0 <= TOTAL_LENGTH (predecessor));
+      eassert (TOTAL_LENGTH (predecessor) >= 0);
      delete_interval (i);
      return predecessor;
    }
  /* Zero out this interval.  */
  i->total_length -= absorb;
-  eassert (0 <= TOTAL_LENGTH (i));
+  eassert (TOTAL_LENGTH (i) >= 0);
  predecessor = i;
  while (! NULL_PARENT (predecessor))   /* It's above us.  Go up,
@@ -1518,7 +1518,7 @@ merge_interval_left (register INTERVAL i)
      predecessor = INTERVAL_PARENT (predecessor);
      predecessor->total_length -= absorb;
-      eassert (0 <= TOTAL_LENGTH (predecessor));
+      eassert (TOTAL_LENGTH (predecessor) >= 0);
    }
  /* This must be the leftmost or first interval and cannot
@@ -2272,7 +2272,7 @@ copy_intervals (INTERVAL tree, ptrdiff_t start, ptrdiff_t length)
  new->position = 0;
  got = (LENGTH (i) - (start - i->position));
  new->total_length = length;
-  eassert (0 <= TOTAL_LENGTH (new));
+  eassert (TOTAL_LENGTH (new) >= 0);
  copy_properties (i, new);
  t = new;
@@ -2355,7 +2355,7 @@ set_intervals_multibyte_1 (INTERVAL i, bool multi_flag,
    i->total_length = end - start;
  else
    i->total_length = end_byte - start_byte;
-  eassert (0 <= TOTAL_LENGTH (i));
+  eassert (TOTAL_LENGTH (i) >= 0);
  if (TOTAL_LENGTH (i) == 0)
    {
diff --git a/src/keyboard.c b/src/keyboard.c
index cf05d2f3855..d373935f3e4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6785,7 +6785,7 @@ gobble_input (void)
          hold_quit.kind = NO_EVENT;
          /* No need for FIONREAD or fcntl; just say don't wait.  */
-          while (0 < (nr = (*t->read_socket_hook) (t, &hold_quit)))
+          while ((nr = (*t->read_socket_hook) (t, &hold_quit)) > 0)
            nread += nr;
          if (nr == -1)          /* Not OK to read input now.  */
@@ -8259,9 +8259,8 @@ append_tool_bar_item (void)
       - (ASIZE (tool_bar_items_vector) - TOOL_BAR_ITEM_NSLOTS));
  /* Enlarge tool_bar_items_vector if necessary.  */
-  if (0 < incr)
+  if (incr > 0)
-    tool_bar_items_vector
+    tool_bar_items_vector = larger_vector (tool_bar_items_vector, incr, -1);
-      = larger_vector (tool_bar_items_vector, incr, -1);
  /* Append entries from tool_bar_item_properties to the end of
     tool_bar_items_vector.  */
diff --git a/src/keymap.c b/src/keymap.c
index 00eefb375ef..110c8f43729 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -611,7 +611,8 @@ map_keymap_internal (Lisp_Object map,
        }
      else if (CHAR_TABLE_P (binding))
        map_char_table (map_keymap_char_table_item, Qnil, binding,
-                        make_save_value ("ppo", fun, data, args));
+                        make_save_value (SAVE_TYPE_PTR_PTR_OBJ,
+                                         fun, data, args));
    }
  UNGCPRO;
  return tail;
@@ -2062,7 +2063,7 @@ For an approximate inverse of this, see `kbd'.  */)
    size += XINT (Flength (prefix));
  /* This has one extra element at the end that we don't pass to Fconcat.  */
-  if (min (PTRDIFF_MAX, SIZE_MAX) / word_size / 4 < size)
+  if (size > min (PTRDIFF_MAX, SIZE_MAX) / word_size / 4)
    memory_full (SIZE_MAX);
  SAFE_ALLOCA_LISP (args, size * 4);
diff --git a/src/lisp.h b/src/lisp.h
index b209a7b1351..8187f7da993 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -548,7 +548,7 @@ static EMACS_INT const VALMASK
   type or if I is a NaN.  */
 #define FIXNUM_OVERFLOW_P(i) \
-  (! ((0 <= (i) || MOST_NEGATIVE_FIXNUM <= (i)) && (i) <= MOST_POSITIVE_FIXNUM))
+  (! (((i) >= 0 || (i) >= MOST_NEGATIVE_FIXNUM) && (i) <= MOST_POSITIVE_FIXNUM))
 LISP_INLINE ptrdiff_t
 clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper)
@@ -556,6 +556,12 @@ clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper)
  return num < lower ? lower : num <= upper ? num : upper;
 }
+/* Forward declarations.  */
+LISP_INLINE bool SAVE_VALUEP (Lisp_Object);
+LISP_INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object);
 /* Extract a value or address from a Lisp_Object.  */
 #define XCONS(a)   (eassert (CONSP (a)), \
@@ -576,7 +582,6 @@ clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper)
 #define XMISCTYPE(a)   (XMISCANY (a)->type)
 #define XMARKER(a)      (eassert (MARKERP (a)), &(XMISC (a)->u_marker))
 #define XOVERLAY(a)     (eassert (OVERLAYP (a)), &(XMISC (a)->u_overlay))
-#define XSAVE_VALUE(a)  (eassert (SAVE_VALUEP (a)), &(XMISC (a)->u_save_value))
 /* Forwarding object types.  */
@@ -786,13 +791,10 @@ extern ptrdiff_t string_bytes (struct Lisp_String *);
   would expose alloc.c internal details that we'd rather keep
   private.
-   This is a macro for use in static initializers, and a constant for
+   This is a macro for use in static initializers.  The cast to
-   visibility to GDB.  The cast to ptrdiff_t ensures that
+   ptrdiff_t ensures that the macro is signed.  */
-   the macro is signed.  */
-static ptrdiff_t const STRING_BYTES_BOUND =
 #define STRING_BYTES_BOUND  \
  ((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, min (SIZE_MAX, PTRDIFF_MAX) - 1))
-        STRING_BYTES_BOUND;
 /* Mark STR as a unibyte string.  */
 #define STRING_SET_UNIBYTE(STR)  \
@@ -1397,6 +1399,35 @@ enum
    SAVE_OBJECT
  };
+/* Number of bits needed to store one of the above values.  */
+enum { SAVE_SLOT_BITS = 2 };
+/* Number of slots in a save value where save_type is nonzero.  */
+enum { SAVE_VALUE_SLOTS = 4 };
+/* Bit-width and values for struct Lisp_Save_Value's save_type member.  */
+enum { SAVE_TYPE_BITS = SAVE_VALUE_SLOTS * SAVE_SLOT_BITS + 1 };
+enum Lisp_Save_Type
+  {
+    SAVE_TYPE_INT_INT = SAVE_INTEGER + (SAVE_INTEGER << SAVE_SLOT_BITS),
+    SAVE_TYPE_INT_INT_INT
+      = (SAVE_INTEGER + (SAVE_TYPE_INT_INT << SAVE_SLOT_BITS)),
+    SAVE_TYPE_OBJ_OBJ = SAVE_OBJECT + (SAVE_OBJECT << SAVE_SLOT_BITS),
+    SAVE_TYPE_OBJ_OBJ_OBJ = SAVE_OBJECT + (SAVE_TYPE_OBJ_OBJ << SAVE_SLOT_BITS),
+    SAVE_TYPE_OBJ_OBJ_OBJ_OBJ
+      = SAVE_OBJECT + (SAVE_TYPE_OBJ_OBJ_OBJ << SAVE_SLOT_BITS),
+    SAVE_TYPE_PTR_INT = SAVE_POINTER + (SAVE_INTEGER << SAVE_SLOT_BITS),
+    SAVE_TYPE_PTR_OBJ = SAVE_POINTER + (SAVE_OBJECT << SAVE_SLOT_BITS),
+    SAVE_TYPE_PTR_PTR = SAVE_POINTER + (SAVE_POINTER << SAVE_SLOT_BITS),
+    SAVE_TYPE_PTR_PTR_OBJ
+      = SAVE_POINTER + (SAVE_TYPE_PTR_OBJ << SAVE_SLOT_BITS),
+    /* This has an extra bit indicating it's raw memory.  */
+    SAVE_TYPE_MEMORY = SAVE_TYPE_PTR_INT + (1 << (SAVE_TYPE_BITS - 1))
+  };
 /* Special object used to hold a different values for later use.
   This is mostly used to package C integers and pointers to call
@@ -1417,73 +1448,96 @@ enum
   If yon need to pass more than just one C pointer, you should
   use make_save_value.  This function allows you to pack up to
-   4 integers, pointers or Lisp_Objects and conveniently get them
+   SAVE_VALUE_SLOTS integers, pointers or Lisp_Objects and
-   back with XSAVE_POINTER, XSAVE_INTEGER and XSAVE_OBJECT macros:
+   conveniently get them back with XSAVE_POINTER, XSAVE_INTEGER and
+   XSAVE_OBJECT macros:
   ...
     struct my_data *md = get_my_data ();
-     ptrdiff_t my_offset = get_my_offset ();
     Lisp_Object my_object = get_my_object ();
     record_unwind_protect
-       (my_unwind, make_save_value ("pio", md, my_offset, my_object));
+       (my_unwind, make_save_value (SAVE_TYPE_PTR_OBJ, md, my_object));
   ...
   Lisp_Object my_unwind (Lisp_Object arg)
   {
     struct my_data *md = XSAVE_POINTER (arg, 0);
-     ptrdiff_t my_offset = XSAVE_INTEGER (arg, 1);
+     Lisp_Object my_object = XSAVE_OBJECT (arg, 1);
-     Lisp_Object my_object = XSAVE_OBJECT (arg, 2);
     ...
   }
   If ENABLE_CHECKING is in effect, XSAVE_xxx macros do type checking of the
   saved objects and raise eassert if type of the saved object doesn't match
   the type which is extracted.  In the example above, XSAVE_INTEGER (arg, 2)
-   or XSAVE_OBJECT (arg, 1) are wrong because integer was saved in slot 1 and
+   or XSAVE_OBJECT (arg, 0) are wrong because nothing was saved in slot 2 and
-   Lisp_Object was saved in slot 2 of ARG.  */
+   Lisp_Object was saved in slot 1 of ARG.  */
 struct Lisp_Save_Value
  {
    ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Save_Value */
    unsigned gcmarkbit : 1;
-    int spacer : 6;
+    int spacer : 32 - (16 + 1 + SAVE_TYPE_BITS);
-    /* If `area' is nonzero, `data[0].pointer' is the address of a memory area
-       containing `data[1].integer' potential Lisp_Objects.  The rest of `data'
+    /* DATA[N] may hold up to SAVE_VALUE_SLOTS entries.  The type of
-       fields are unused.  */
+       V's Ith entry is given by save_type (V, I).  E.g., if save_type
-    unsigned area : 1;
+       (V, 3) == SAVE_INTEGER, V->data[3].integer is in use.
-    /* If `area' is zero, `data[N]' may hold different objects which type is
-       encoded in `typeN' fields as described by the anonymous enum above.
+       If SAVE_TYPE == SAVE_TYPE_MEMORY, DATA[0].pointer is the address of
-       E.g. if `type0' is SAVE_INTEGER, `data[0].integer' is in use.  */
+       a memory area containing DATA[1].integer potential Lisp_Objects.  */
-    unsigned type0 : 2;
+    ENUM_BF (Lisp_Save_Type) save_type : SAVE_TYPE_BITS;
-    unsigned type1 : 2;
-    unsigned type2 : 2;
-    unsigned type3 : 2;
    union {
      void *pointer;
      ptrdiff_t integer;
      Lisp_Object object;
-    } data[4];
+    } data[SAVE_VALUE_SLOTS];
  };
-/* Macro to set and extract Nth saved pointer.  Type
+/* Return the type of V's Nth saved value.  */
-   checking is ugly because it's used as an lvalue.  */
+LISP_INLINE int
+save_type (struct Lisp_Save_Value *v, int n)
+{
+  eassert (0 <= n && n < SAVE_VALUE_SLOTS);
+  return (v->save_type >> (SAVE_SLOT_BITS * n) & ((1 << SAVE_SLOT_BITS) - 1));
+}
+/* Get and set the Nth saved pointer.  */
-#define XSAVE_POINTER(obj, n)                                   \
+LISP_INLINE void *
-  XSAVE_VALUE (obj)->data[(eassert (XSAVE_VALUE (obj)->type     \
+XSAVE_POINTER (Lisp_Object obj, int n)
-    ## n == SAVE_POINTER), n)].pointer
+{
+  eassert (save_type (XSAVE_VALUE (obj), n) == SAVE_POINTER);
+  return XSAVE_VALUE (obj)->data[n].pointer;;
+}
+LISP_INLINE void
+set_save_pointer (Lisp_Object obj, int n, void *val)
+{
+  eassert (save_type (XSAVE_VALUE (obj), n) == SAVE_POINTER);
+  XSAVE_VALUE (obj)->data[n].pointer = val;
+}
 /* Likewise for the saved integer.  */
-#define XSAVE_INTEGER(obj, n)                                   \
+LISP_INLINE ptrdiff_t
-  XSAVE_VALUE (obj)->data[(eassert (XSAVE_VALUE (obj)->type     \
+XSAVE_INTEGER (Lisp_Object obj, int n)
-    ## n == SAVE_INTEGER), n)].integer
+{
+  eassert (save_type (XSAVE_VALUE (obj), n) == SAVE_INTEGER);
+  return XSAVE_VALUE (obj)->data[n].integer;
+}
+LISP_INLINE void
+set_save_integer (Lisp_Object obj, int n, ptrdiff_t val)
+{
+  eassert (save_type (XSAVE_VALUE (obj), n) == SAVE_INTEGER);
+  XSAVE_VALUE (obj)->data[n].integer = val;
+}
-/* Macro to extract Nth saved object.  This is never used as
+/* Extract Nth saved object.  */
-   an lvalue, so we can do more convenient type checking.  */
-#define XSAVE_OBJECT(obj, n)                                    \
+LISP_INLINE Lisp_Object
-  (eassert (XSAVE_VALUE (obj)->type ## n == SAVE_OBJECT),       \
+XSAVE_OBJECT (Lisp_Object obj, int n)
-   XSAVE_VALUE (obj)->data[n].object)
+{
+  eassert (save_type (XSAVE_VALUE (obj), n) == SAVE_OBJECT);
+  return XSAVE_VALUE (obj)->data[n].object;
+}
 /* A miscellaneous object, when it's on the free list.  */
 struct Lisp_Free
@@ -1506,6 +1560,13 @@ union Lisp_Misc
    struct Lisp_Save_Value u_save_value;
  };
+LISP_INLINE struct Lisp_Save_Value *
+XSAVE_VALUE (Lisp_Object a)
+{
+  eassert (SAVE_VALUEP (a));
+  return & XMISC (a)->u_save_value;
+}
 /* Forwarding pointer to an int variable.
   This is allowed only in the value cell of a symbol,
   and it means that the symbol's value really lives in the
@@ -1791,7 +1852,12 @@ typedef struct {
 #define VECTORP(x) (VECTORLIKEP (x) && !(ASIZE (x) & PSEUDOVECTOR_FLAG))
 #define OVERLAYP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Overlay)
 #define MARKERP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Marker)
-#define SAVE_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value)
+LISP_INLINE bool
+SAVE_VALUEP (Lisp_Object x)
+{
+  return MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value;
+}
 #define AUTOLOADP(x) (CONSP (x) && EQ (Qautoload, XCAR (x)))
@@ -2504,7 +2570,7 @@ gc_aset (Lisp_Object array, ptrdiff_t idx, Lisp_Object val)
 LISP_INLINE void
 vcopy (Lisp_Object v, ptrdiff_t offset, Lisp_Object *args, ptrdiff_t count)
 {
-  eassert (0 <= offset && 0 <= count && offset + count <= ASIZE (v));
+  eassert (offset >= 0 && count >= 0 && offset + count <= ASIZE (v));
  memcpy (XVECTOR (v)->contents + offset, args, count * sizeof *args);
 }
@@ -3110,7 +3176,7 @@ extern bool abort_on_gc;
 extern Lisp_Object make_float (double);
 extern void display_malloc_warning (void);
 extern ptrdiff_t inhibit_garbage_collection (void);
-extern Lisp_Object make_save_value (const char *, ...);
+extern Lisp_Object make_save_value (enum Lisp_Save_Type, ...);
 extern Lisp_Object make_save_pointer (void *);
 extern Lisp_Object build_overlay (Lisp_Object, Lisp_Object, Lisp_Object);
 extern void free_marker (Lisp_Object);
@@ -3168,6 +3234,7 @@ extern Lisp_Object internal_with_output_to_temp_buffer
        (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
 enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
 extern int float_to_string (char *, double);
+extern void init_print_once (void);
 extern void syms_of_print (void);
 /* Defined in doprnt.c.  */
@@ -3449,7 +3516,7 @@ extern Lisp_Object Qvisible;
 extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object);
 extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object);
-#if HAVE_NS
+#if HAVE_NS || defined(WINDOWSNT)
 extern Lisp_Object get_frame_param (struct frame *, Lisp_Object);
 #endif
 extern void frames_discard_buffer (Lisp_Object);
@@ -3826,8 +3893,7 @@ extern void *record_xmalloc (size_t);
      {                                                        \
        Lisp_Object arg_;                                      \
        buf = xmalloc ((nelt) * word_size);                    \
-        arg_ = make_save_value ("pi", buf, nelt);              \
+        arg_ = make_save_value (SAVE_TYPE_MEMORY, buf, nelt);  \
-        XSAVE_VALUE (arg_)->area = 1;                          \
        sa_must_free = 1;                                      \
        record_unwind_protect (safe_alloca_unwind, arg_);      \
      }                                                        \
diff --git a/src/lread.c b/src/lread.c
index f8ab03af218..d7a16f813c8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1571,7 +1571,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
                {
                  struct stat st;
                  fd = emacs_open (pfn, O_RDONLY, 0);
-                  if (0 <= fd
+                  if (fd >= 0
                      && (fstat (fd, &st) != 0 || S_ISDIR (st.st_mode)))
                    {
                      emacs_close (fd);
@@ -2359,7 +2359,7 @@ read_integer (Lisp_Object readcharfun, EMACS_INT radix)
          while (c == '0');
        }
-      while (-1 <= (digit = digit_to_number (c, radix)))
+      while ((digit = digit_to_number (c, radix)) >= -1)
        {
          if (digit == -1)
            valid = 0;
@@ -2731,8 +2731,8 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
          /* Read a non-negative integer.  */
          while (c >= '0' && c <= '9')
            {
-              if (MOST_POSITIVE_FIXNUM / 10 < n
+              if (n > MOST_POSITIVE_FIXNUM / 10
-                  || MOST_POSITIVE_FIXNUM < n * 10 + c - '0')
+                  || n * 10 + c - '0' > MOST_POSITIVE_FIXNUM)
                n = MOST_POSITIVE_FIXNUM + 1;
              else
                n = n * 10 + c - '0';
@@ -2930,7 +2930,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
            if (end - p < MAX_MULTIBYTE_LENGTH)
              {
                ptrdiff_t offset = p - read_buffer;
-                if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+                if (read_buffer_size > min (PTRDIFF_MAX, SIZE_MAX) / 2)
                  memory_full (SIZE_MAX);
                read_buffer = xrealloc (read_buffer, read_buffer_size * 2);
                read_buffer_size *= 2;
@@ -3064,7 +3064,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
              if (end - p < MAX_MULTIBYTE_LENGTH)
                {
                  ptrdiff_t offset = p - read_buffer;
-                  if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+                  if (read_buffer_size > min (PTRDIFF_MAX, SIZE_MAX) / 2)
                    memory_full (SIZE_MAX);
                  read_buffer = xrealloc (read_buffer, read_buffer_size * 2);
                  read_buffer_size *= 2;
@@ -3094,7 +3094,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
          if (p == end)
            {
              ptrdiff_t offset = p - read_buffer;
-              if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+              if (read_buffer_size > min (PTRDIFF_MAX, SIZE_MAX) / 2)
                memory_full (SIZE_MAX);
              read_buffer = xrealloc (read_buffer, read_buffer_size * 2);
              read_buffer_size *= 2;
@@ -3298,12 +3298,12 @@ string_to_number (char const *string, int base, bool ignore_trailing)
  state = 0;
  leading_digit = digit_to_number (*cp, base);
-  if (0 <= leading_digit)
+  if (leading_digit >= 0)
    {
      state |= LEAD_INT;
      do
        ++cp;
-      while (0 <= digit_to_number (*cp, base));
+      while (digit_to_number (*cp, base) >= 0);
    }
  if (*cp == '.')
    {
@@ -3380,7 +3380,7 @@ string_to_number (char const *string, int base, bool ignore_trailing)
  /* If the number uses integer and not float syntax, and is in C-language
     range, use its value, preferably as a fixnum.  */
-  if (0 <= leading_digit && ! float_syntax)
+  if (leading_digit >= 0 && ! float_syntax)
    {
      uintmax_t n;
diff --git a/src/menu.c b/src/menu.c
index fdef54dd657..ffb5c3bc936 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -173,7 +173,7 @@ static void
 ensure_menu_items (int items)
 {
  int incr = items - (menu_items_allocated - menu_items_used);
-  if (0 < incr)
+  if (incr > 0)
    {
      menu_items = larger_vector (menu_items, incr, INT_MAX);
      menu_items_allocated = ASIZE (menu_items);
diff --git a/src/minibuf.c b/src/minibuf.c
index 25425cb97dc..56459353714 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -251,7 +251,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
        {
          if (len == size)
            {
-              if (STRING_BYTES_BOUND / 2 < size)
+              if (size > STRING_BYTES_BOUND / 2)
                memory_full (SIZE_MAX);
              size *= 2;
              line = xrealloc (line, size);
diff --git a/src/nsfns.m b/src/nsfns.m
index e4dde5fb894..9c3051a8c6a 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -261,6 +261,29 @@ ns_display_info_for_name (Lisp_Object name)
  return dpyinfo;
 }
+static NSString *
+ns_filename_from_panel (NSSavePanel *panel)
+{
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+  NSURL *url = [panel URL];
+  NSString *str = [url path];
+  return str;
+#else
+  return [panel filename];
+#endif
+}
+static NSString *
+ns_directory_from_panel (NSSavePanel *panel)
+{
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+  NSURL *url = [panel directoryURL];
+  NSString *str = [url path];
+  return str;
+#else
+  return [panel directory];
+#endif
+}
 static Lisp_Object
 interpret_services_menu (NSMenu *menu, Lisp_Object prefix, Lisp_Object old)
@@ -1220,9 +1243,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
      specbind (Qx_resource_name, name);
    }
-  f->resx = dpyinfo->resx;
-  f->resy = dpyinfo->resy;
  block_input ();
  register_font_driver (&nsfont_driver, f);
  x_default_parameter (f, parms, Qfont_backend, Qnil,
@@ -1471,7 +1491,7 @@ Optional arg DIR_ONLY_P, if non-nil, means choose only directories.  */)
   Lisp_Object init, Lisp_Object dir_only_p)
 {
  static id fileDelegate = nil;
-  int ret;
+  BOOL ret;
  id panel;
  Lisp_Object fname;
@@ -1508,6 +1528,13 @@ Optional arg DIR_ONLY_P, if non-nil, means choose only directories.  */)
      [panel setCanChooseDirectories: YES];
      [panel setCanChooseFiles: NO];
    }
+  else
+    {
+      /* This is not quite what the documentation says, but it is compatible
+         with the Gtk+ code.  Also, the menu entry says "Open File...".  */
+      [panel setCanChooseDirectories: NO];
+      [panel setCanChooseFiles: YES];
+    }
  block_input ();
 #if defined (NS_IMPL_COCOA) && \
@@ -1528,15 +1555,19 @@ Optional arg DIR_ONLY_P, if non-nil, means choose only directories.  */)
    }
  else
    {
-      [panel setCanChooseDirectories: YES];
      ret = [panel runModalForDirectory: dirS file: initS types: nil];
    }
 #endif
  ret = (ret == NSOKButton) || panelOK;
-  if (ret)
+  if (ret) 
-    fname = build_string ([[panel filename] UTF8String]);
+    {
+      NSString *str = [panel getFilename];
+      if (! str) str = [panel getDirectory];
+      if (! str) ret = NO;
+      else fname = build_string ([str UTF8String]);
+    }
  [[FRAME_NS_VIEW (SELECTED_FRAME ()) window] makeKeyWindow];
  unblock_input ();
@@ -2603,6 +2634,14 @@ Value is t if tooltip was open, nil otherwise.  */)
  [NSApp stop: self];
 }
 #endif
+- (NSString *) getFilename
+{
+  return ns_filename_from_panel (self);
+}
+- (NSString *) getDirectory
+{
+  return ns_directory_from_panel (self);
+}
 @end
@@ -2616,6 +2655,12 @@ Value is t if tooltip was open, nil otherwise.  */)
 - (void) ok: (id)sender
 {
  [super ok: sender];
+  // If not choosing directories, and Open is pressed on a directory, return.
+  if (! [self canChooseDirectories] && [self getDirectory] &&
+      ! [self getFilename])
+    return;
  panelOK = 1;
  [NSApp stop: self];
 }
@@ -2624,7 +2669,17 @@ Value is t if tooltip was open, nil otherwise.  */)
  [super cancel: sender];
  [NSApp stop: self];
 }
 #endif
+- (NSString *) getFilename
+{
+  return ns_filename_from_panel (self);
+}
+- (NSString *) getDirectory
+{
+  return ns_directory_from_panel (self);
+}
 @end
diff --git a/src/nsterm.h b/src/nsterm.h
index 41dbaf3c0f7..6bd04b96684 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -267,10 +267,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 @interface EmacsSavePanel : NSSavePanel
 {
 }
+- (NSString *) getFilename;
+- (NSString *) getDirectory;
 @end
 @interface EmacsOpenPanel : NSOpenPanel
 {
 }
+- (NSString *) getFilename;
+- (NSString *) getDirectory;
 @end
 @interface EmacsFileDelegate : NSObject
diff --git a/src/nsterm.m b/src/nsterm.m
index 1f09e031592..40e506eab27 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3601,6 +3601,11 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
          result = t;
        }
    }
+  else
+    {
+      errno = EINTR;
+      result = -1;
+    }
  return result;
 }
@@ -5448,12 +5453,26 @@ not_in_argv (NSString *arg)
  if (oldr != rows || oldc != cols || neww != oldw || newh != oldh)
    {
+      struct frame *f = emacsframe;
      NSView *view = FRAME_NS_VIEW (emacsframe);
+      NSWindow *win = [view window];
+      NSSize sz = [win resizeIncrements];
      FRAME_PIXEL_WIDTH (emacsframe) = neww;
      FRAME_PIXEL_HEIGHT (emacsframe) = newh;
      change_frame_size (emacsframe, rows, cols, 0, delay, 0);
      SET_FRAME_GARBAGED (emacsframe);
      cancel_mouse_face (emacsframe);
+      // Did resize increments change because of a font change?
+      if (sz.width != FRAME_COLUMN_WIDTH (emacsframe) ||
+          sz.height != FRAME_LINE_HEIGHT (emacsframe))
+        {
+          sz.width = FRAME_COLUMN_WIDTH (emacsframe);
+          sz.height = FRAME_LINE_HEIGHT (emacsframe);
+          [win setResizeIncrements: sz];
+        }
      [view setFrame: NSMakeRect (0, 0, neww, newh)];
      [self windowDidMove:nil];   // Update top/left.
    }
diff --git a/src/print.c b/src/print.c
index cc451d2e395..8498a758a21 100644
--- a/src/print.c
+++ b/src/print.c
@@ -229,9 +229,9 @@ printchar (unsigned int ch, Lisp_Object fun)
      if (NILP (fun))
        {
          ptrdiff_t incr = len - (print_buffer_size - print_buffer_pos_byte);
-          if (0 < incr)
+          if (incr > 0)
-            print_buffer =
+            print_buffer = xpalloc (print_buffer, &print_buffer_size,
-              xpalloc (print_buffer, &print_buffer_size, incr, -1, 1);
+                                    incr, -1, 1);
          memcpy (print_buffer + print_buffer_pos_byte, str, len);
          print_buffer_pos += 1;
          print_buffer_pos_byte += len;
@@ -275,7 +275,7 @@ strout (const char *ptr, ptrdiff_t size, ptrdiff_t size_byte,
  if (NILP (printcharfun))
    {
      ptrdiff_t incr = size_byte - (print_buffer_size - print_buffer_pos_byte);
-      if (0 < incr)
+      if (incr > 0)
        print_buffer = xpalloc (print_buffer, &print_buffer_size, incr, -1, 1);
      memcpy (print_buffer + print_buffer_pos_byte, ptr, size_byte);
      print_buffer_pos += size;
@@ -2051,17 +2051,15 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
            strout ("#<save-value ", -1, -1, printcharfun);
-            if (v->area)
+            if (v->save_type == SAVE_TYPE_MEMORY)
              {
                ptrdiff_t amount = v->data[1].integer;
 #if GC_MARK_STACK
-                /* If GC_MARK_STACK, valid_lisp_object_p is quite reliable,
+                /* valid_lisp_object_p is reliable, so try to print up
-                   and so we try to print up to 8 objects we have saved.
+                   to 8 saved objects.  This code is rarely used, so
-                   Although valid_lisp_object_p is slow, this shouldn't be
+                   it's OK that valid_lisp_object_p is slow.  */
-                   a real bottleneck because we do not use this code under
-                   normal circumstances.  */
                int limit = min (amount, 8);
                Lisp_Object *area = v->data[0].pointer;
@@ -2086,9 +2084,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
 #else /* not GC_MARK_STACK */
-                /* If !GC_MARK_STACK, we have no reliable way to find
+                /* There is no reliable way to determine whether the objects
-                   whether Lisp_Object pointers points to an initialized
+                   are initialized, so do not try to print them.  */
-                   objects, and so we do not ever trying to print them.  */
                i = sprintf (buf, "with %"pD"d objects", amount);
                strout (buf, i, i, printcharfun);
@@ -2097,33 +2094,37 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
              }
            else
              {
-                /* Print each `data[N]' slot according to its type.  */
+                /* Print each slot according to its type.  */
+                int index;
-#define PRINTX(index)                                                   \
+                for (index = 0; index < SAVE_VALUE_SLOTS; index++)
-  do {                                                                  \
+                  {
-    i = 0;                                                              \
+                    if (index)
-    if (v->type ## index == SAVE_UNUSED)                                \
+                      PRINTCHAR (' ');
-      i = sprintf (buf, "<unused>");                                    \
-    else if (v->type ## index == SAVE_INTEGER)                          \
-      i = sprintf (buf, "<integer %"pD"d>", v->data[index].integer);    \
-    else if (v->type ## index == SAVE_POINTER)                          \
-      i = sprintf (buf, "<pointer %p>", v->data[index].pointer);        \
-    else /* SAVE_OBJECT */                                              \
-      print_object (v->data[index].object, printcharfun, escapeflag);   \
-    if (i)                                                              \
-      strout (buf, i, i, printcharfun);                                 \
-  } while (0)
-                PRINTX (0);
-                PRINTCHAR (' ');
-                PRINTX (1);
-                PRINTCHAR (' ');
-                PRINTX (2);
-                PRINTCHAR (' ');
-                PRINTX (3);
-#undef PRINTX
+                    switch (save_type (v, index))
+                      {
+                      case SAVE_UNUSED:
+                        i = sprintf (buf, "<unused>");
+                        break;
+                      case SAVE_POINTER:
+                        i = sprintf (buf, "<pointer %p>",
+                                     v->data[index].pointer);
+                        break;
+                      case SAVE_INTEGER:
+                        i = sprintf (buf, "<integer %"pD"d>",
+                                     v->data[index].integer);
+                        break;
+                      case SAVE_OBJECT:
+                        print_object (v->data[index].object, printcharfun,
+                                      escapeflag);
+                        continue;
+                      }
+                    strout (buf, i, i, printcharfun);
+                  }
              }
            PRINTCHAR ('>');
          }
@@ -2174,7 +2175,16 @@ print_interval (INTERVAL interval, Lisp_Object printcharfun)
  print_object (interval->plist, printcharfun, 1);
 }
+/* Initialize debug_print stuff early to have it working from the very
+   beginning.  */
+void
+init_print_once (void)
+{
+  DEFSYM (Qexternal_debugging_output, "external-debugging-output");
+  defsubr (&Sexternal_debugging_output);
+}
 void
 syms_of_print (void)
 {
@@ -2306,12 +2316,10 @@ priorities.  */);
  defsubr (&Sprint);
  defsubr (&Sterpri);
  defsubr (&Swrite_char);
-  defsubr (&Sexternal_debugging_output);
 #ifdef WITH_REDIRECT_DEBUGGING_OUTPUT
  defsubr (&Sredirect_debugging_output);
 #endif
-  DEFSYM (Qexternal_debugging_output, "external-debugging-output");
  DEFSYM (Qprint_escape_newlines, "print-escape-newlines");
  DEFSYM (Qprint_escape_multibyte, "print-escape-multibyte");
  DEFSYM (Qprint_escape_nonascii, "print-escape-nonascii");
diff --git a/src/process.c b/src/process.c
index bafdca9bd63..6a14a536707 100644
--- a/src/process.c
+++ b/src/process.c
@@ -136,7 +136,7 @@ extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
 /* Work around GCC 4.7.0 bug with strict overflow checking; see
   <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>.
   These lines can be removed once the GCC bug is fixed.  */
-#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 # pragma GCC diagnostic ignored "-Wstrict-overflow"
 #endif
@@ -1804,7 +1804,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
  /* Back in the parent process.  */
  XPROCESS (process)->pid = pid;
-  if (0 <= pid)
+  if (pid >= 0)
    XPROCESS (process)->alive = 1;
  /* Stop blocking signals in the parent.  */
@@ -2155,7 +2155,7 @@ Returns nil upon error setting address, ADDRESS otherwise.  */)
  channel = XPROCESS (process)->infd;
  len = get_lisp_to_sockaddr_size (address, &family);
-  if (datagram_address[channel].len != len)
+  if (len == 0 || datagram_address[channel].len != len)
    return Qnil;
  conv_lisp_to_sockaddr (family, address, datagram_address[channel].sa, len);
  return address;
@@ -3269,7 +3269,8 @@ usage: (make-network-process &rest ARGS)  */)
                {
                  int rfamily, rlen;
                  rlen = get_lisp_to_sockaddr_size (remote, &rfamily);
-                  if (rfamily == lres->ai_family && rlen == lres->ai_addrlen)
+                  if (rlen != 0 && rfamily == lres->ai_family
+                      && rlen == lres->ai_addrlen)
                    conv_lisp_to_sockaddr (rfamily, remote,
                                           datagram_address[s].sa, rlen);
                }
@@ -3900,7 +3901,7 @@ Return non-nil if we received any output before the timeout expired.  */)
    {
      if (INTEGERP (seconds))
        {
-          if (0 < XINT (seconds))
+          if (XINT (seconds) > 0)
            {
              secs = XINT (seconds);
              nsecs = 0;
@@ -3908,7 +3909,7 @@ Return non-nil if we received any output before the timeout expired.  */)
        }
      else if (FLOATP (seconds))
        {
-          if (0 < XFLOAT_DATA (seconds))
+          if (XFLOAT_DATA (seconds) > 0)
            {
              EMACS_TIME t = EMACS_TIME_FROM_DOUBLE (XFLOAT_DATA (seconds));
              secs = min (EMACS_SECS (t), WAIT_READING_MAX);
@@ -4235,12 +4236,12 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
      time_limit = 0;
      nsecs = -1;
    }
-  else if (TYPE_MAXIMUM (time_t) < time_limit)
+  else if (time_limit > TYPE_MAXIMUM (time_t))
    time_limit = TYPE_MAXIMUM (time_t);
  /* Since we may need to wait several times,
     compute the absolute time to return at.  */
-  if (time_limit || 0 < nsecs)
+  if (time_limit || nsecs > 0)
    {
      timeout = make_emacs_time (time_limit, nsecs);
      end_time = add_emacs_time (current_emacs_time (), timeout);
@@ -4272,7 +4273,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
          timeout = make_emacs_time (0, 0);
        }
-      else if (time_limit || 0 < nsecs)
+      else if (time_limit || nsecs > 0)
        {
          EMACS_TIME now = current_emacs_time ();
          if (EMACS_TIME_LE (end_time, now))
@@ -4324,7 +4325,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
            break;
          /* A negative timeout means do not wait at all.  */
-          if (0 <= nsecs)
+          if (nsecs >= 0)
            {
              if (EMACS_TIME_VALID_P (timer_delay))
                {
@@ -4406,7 +4407,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
              if (nread == 0)
                break;
-              if (0 < nread)
+              if (nread > 0)
                {
                  total_nread += nread;
                  got_some_input = 1;
@@ -4947,7 +4948,7 @@ read_process_output (Lisp_Object proc, register int channel)
  else
 #endif
    {
-      bool buffered = 0 <= proc_buffered_char[channel];
+      bool buffered = proc_buffered_char[channel] >= 0;
      if (buffered)
        {
          chars[carryover] = proc_buffered_char[channel];
@@ -5454,7 +5455,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len,
              rv = sendto (outfd, cur_buf, cur_len,
                           0, datagram_address[outfd].sa,
                           datagram_address[outfd].len);
-              if (0 <= rv)
+              if (rv >= 0)
                written = rv;
              else if (errno == EMSGSIZE)
                report_file_error ("sending datagram", Fcons (proc, Qnil));
@@ -6577,7 +6578,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
    time_limit = TYPE_MAXIMUM (time_t);
  /* What does time_limit really mean?  */
-  if (time_limit || 0 < nsecs)
+  if (time_limit || nsecs > 0)
    {
      timeout = make_emacs_time (time_limit, nsecs);
      end_time = add_emacs_time (current_emacs_time (), timeout);
@@ -6615,7 +6616,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
          timeout = make_emacs_time (0, 0);
        }
-      else if (time_limit || 0 < nsecs)
+      else if (time_limit || nsecs > 0)
        {
          EMACS_TIME now = current_emacs_time ();
          if (EMACS_TIME_LE (end_time, now))
@@ -6653,7 +6654,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
              && requeued_events_pending_p ())
            break;
-          if (EMACS_TIME_VALID_P (timer_delay) && 0 <= nsecs)
+          if (EMACS_TIME_VALID_P (timer_delay) && nsecs >= 0)
            {
              if (EMACS_TIME_LT (timer_delay, timeout))
                {
diff --git a/src/profiler.c b/src/profiler.c
index 85d9c1ca88a..0a0a4d0bc57 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -55,7 +55,7 @@ make_log (int heap_size, int max_stack_depth)
  /* What is special about our hash-tables is that the keys are pre-filled
     with the vectors we'll put in them.  */
  int i = ASIZE (h->key_and_value) / 2;
-  while (0 < i)
+  while (i > 0)
    set_hash_key_slot (h, --i,
                       Fmake_vector (make_number (max_stack_depth), Qnil));
  return log;
@@ -247,7 +247,7 @@ handle_profiler_signal (int signal)
      if (profiler_timer_ok)
        {
          int overruns = timer_getoverrun (profiler_timer);
-          eassert (0 <= overruns);
+          eassert (overruns >= 0);
          count += overruns;
        }
 #endif
diff --git a/src/regex.c b/src/regex.c
index 051a4fdc26b..648f2529649 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -33,7 +33,7 @@
 /* Ignore some GCC warnings for now.  This section should go away
   once the Emacs and Gnulib regex code is merged.  */
-#if (__GNUC__ == 4 && 5 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 # pragma GCC diagnostic ignored "-Wstrict-overflow"
 # ifndef emacs
 #  pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -6404,8 +6404,8 @@ weak_function
 re_exec (const char *s)
 {
  const size_t len = strlen (s);
-  return
+  return (re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0)
-    0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
+          >= 0);
 }
 #endif /* _REGEX_RE_COMP */
diff --git a/src/regex.h b/src/regex.h
index f1fd837bd6f..8fe7ba16adc 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -530,7 +530,7 @@ extern int re_exec (const char *);
 /* GCC 2.95 and later have "__restrict"; C99 compilers have
   "restrict", and "configure" may have defined "restrict".  */
 #ifndef __restrict
-# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+# if ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
 #  if defined restrict || 199901L <= __STDC_VERSION__
 #   define __restrict restrict
 #  else
diff --git a/src/search.c b/src/search.c
index c5ac7d494dc..ece346ecd06 100644
--- a/src/search.c
+++ b/src/search.c
@@ -326,7 +326,7 @@ looking_at_1 (Lisp_Object string, bool posix)
  if (i == -2)
    matcher_overflow ();
-  val = (0 <= i ? Qt : Qnil);
+  val = (i >= 0 ? Qt : Qnil);
  if (NILP (Vinhibit_changing_match_data) && i >= 0)
    for (i = 0; i < search_regs.num_regs; i++)
      if (search_regs.start[i] >= 0)
@@ -2450,7 +2450,7 @@ since only regular expressions have distinguished subexpressions.  */)
                  else if (c >= '1' && c <= '9')
                    {
                      if (c - '0' < search_regs.num_regs
-                          && 0 <= search_regs.start[c - '0'])
+                          && search_regs.start[c - '0'] >= 0)
                        {
                          substart = search_regs.start[c - '0'];
                          subend = search_regs.end[c - '0'];
@@ -2533,7 +2533,7 @@ since only regular expressions have distinguished subexpressions.  */)
      bool str_multibyte = STRING_MULTIBYTE (newtext);
      bool really_changed = 0;
-      substed_alloc_size = ((STRING_BYTES_BOUND - 100) / 2 < length
+      substed_alloc_size = (length > (STRING_BYTES_BOUND - 100) / 2
                            ? STRING_BYTES_BOUND
                            : length * 2 + 100);
      substed = xmalloc (substed_alloc_size);
diff --git a/src/sysdep.c b/src/sysdep.c
index bff11fc9f75..1d3e646d359 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -282,7 +282,7 @@ get_child_status (pid_t child, int *status, int options, bool interruptible)
     reap an unwanted process by mistake.  For example, invoking
     waitpid (-1, ...) can mess up glib by reaping glib's subprocesses,
     so that another thread running glib won't find them.  */
-  eassert (0 < child);
+  eassert (child > 0);
  while ((pid = waitpid (child, status, options)) < 0)
    {
@@ -2691,7 +2691,7 @@ procfs_ttyname (int rdev)
      while (!feof (fdev) && !ferror (fdev))
        {
-          if (3 <= fscanf (fdev, "%*s %s %u %s %*s\n", name, &major, minor)
+          if (fscanf (fdev, "%*s %s %u %s %*s\n", name, &major, minor) >= 3
              && major == MAJOR (rdev))
            {
              minor_beg = strtoul (minor, &endp, 0);
@@ -2731,7 +2731,7 @@ procfs_get_total_memory (void)
      while (!feof (fmem) && !ferror (fmem))
        {
-          if (2 <= fscanf (fmem, "%s %lu kB\n", entry_name, &entry_value)
+          if (fscanf (fmem, "%s %lu kB\n", entry_name, &entry_value) >= 2
              && strcmp (entry_name, "MemTotal:") == 0)
            {
              retval = entry_value;
diff --git a/src/systime.h b/src/systime.h
index fa5e7270cb5..da495b9064b 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -121,7 +121,7 @@ EMACS_TIME_SIGN (EMACS_TIME t)
 SYSTIME_INLINE int
 EMACS_TIME_VALID_P (EMACS_TIME t)
 {
-  return 0 <= t.tv_nsec;
+  return t.tv_nsec >= 0;
 }
 /* Convert the double D to the greatest EMACS_TIME not greater than D.
diff --git a/src/term.c b/src/term.c
index 38706602a02..28b944c6436 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2909,7 +2909,7 @@ dissociate_if_controlling_tty (int fd)
 {
  /* If tcgetpgrp succeeds, fd is the controlling terminal,
     so dissociate it by invoking setsid.  */
-  if (0 <= tcgetpgrp (fd) && setsid () < 0)
+  if (tcgetpgrp (fd) >= 0 && setsid () < 0)
    {
 #ifdef TIOCNOTTY
      /* setsid failed, presumably because Emacs is already a process
diff --git a/src/unexcw.c b/src/unexcw.c
index af93e158e14..1290c28d245 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -20,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include "unexec.h"
-#include "w32common.h"
 #include <lisp.h>
 #include <stdio.h>
@@ -31,6 +30,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DOTEXE ".exe"
+extern void report_sheap_usage (int);
 extern int bss_sbrk_did_unexec;
 extern int __malloc_initialized;
@@ -73,7 +74,11 @@ read_exe_header (int fd, exe_header_t * exe_header_buffer)
  assert (exe_header_buffer->file_header.e_magic == 0x5a4d);
  assert (exe_header_buffer->file_header.nt_signature == 0x4550);
+#ifdef __x86_64__
+  assert (exe_header_buffer->file_header.f_magic == 0x8664);
+#else
  assert (exe_header_buffer->file_header.f_magic == 0x014c);
+#endif
  assert (exe_header_buffer->file_header.f_nscns > 0);
  assert (exe_header_buffer->file_header.f_nscns <=
          sizeof (exe_header_buffer->section_header) /
@@ -85,7 +90,11 @@ read_exe_header (int fd, exe_header_t * exe_header_buffer)
          sizeof (exe_header_buffer->file_optional_header));
  assert (ret == sizeof (exe_header_buffer->file_optional_header));
+#ifdef __x86_64__
+  assert (exe_header_buffer->file_optional_header.magic == 0x020b);
+#else
  assert (exe_header_buffer->file_optional_header.magic == 0x010b);
+#endif
  for (i = 0; i < exe_header_buffer->file_header.f_nscns; ++i)
    {
@@ -132,7 +141,7 @@ fixup_executable (int fd)
        exe_header->file_optional_header.ImageBase +
        exe_header->section_header[i].s_paddr;
      if (debug_unexcw)
-        printf ("%8s start 0x%08x end 0x%08x\n",
+        printf ("%8s start %#lx end %#lx\n",
                exe_header->section_header[i].s_name,
                start_address, end_address);
      if (my_edata >= (char *) start_address
@@ -149,7 +158,7 @@ fixup_executable (int fd)
          assert (ret == my_edata - (char *) start_address);
          ++found_data;
          if (debug_unexcw)
-            printf ("         .data, mem start 0x%08x mem length %d\n",
+            printf ("         .data, mem start %#lx mem length %d\n",
                    start_address, my_edata - (char *) start_address);
          if (debug_unexcw)
            printf ("         .data, file start %d file length %d\n",
@@ -233,7 +242,7 @@ fixup_executable (int fd)
          __malloc_initialized = 1;
          assert (ret == (my_endbss - (char *) start_address));
          if (debug_unexcw)
-            printf ("         .bss, mem start 0x%08x mem length %d\n",
+            printf ("         .bss, mem start %#lx mem length %d\n",
                    start_address, my_endbss - (char *) start_address);
          if (debug_unexcw)
            printf ("         .bss, file start %d file length %d\n",
diff --git a/src/w32.c b/src/w32.c
index 647faf94ef1..f3c98bf9596 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -29,10 +29,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <ctype.h>
 #include <signal.h>
 #include <sys/file.h>
+#include <time.h>       /* must be before nt/inc/sys/time.h, for MinGW64 */
 #include <sys/time.h>
 #include <sys/utime.h>
 #include <math.h>
-#include <time.h>
 /* must include CRT headers *before* config.h */
@@ -69,7 +69,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <pwd.h>
 #include <grp.h>
-#ifdef __GNUC__
+/* MinGW64 (_W64) defines these in its _mingw.h.  */
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif
@@ -96,6 +97,7 @@ typedef struct _MEMORY_STATUS_EX {
 #ifndef _MSC_VER
 #include <w32api.h>
 #endif
+#if _WIN32_WINNT < 0x0500
 #if !defined (__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
 /* This either is not in psapi.h or guarded by higher value of
   _WIN32_WINNT than what we use.  w32api supplied with MinGW 3.15
@@ -114,6 +116,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
  SIZE_T PrivateUsage;
 } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
 #endif
+#endif
 #include <winioctl.h>
 #include <aclapi.h>
@@ -127,7 +130,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
 #define SDDL_REVISION_1 1
 #endif  /* SDDL_REVISION_1 */
-#ifdef _MSC_VER
+#ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE
 /* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the
   associated macros, except on ntifs.h, which cannot be included
   because it triggers conflicts with other Windows API headers.  So
diff --git a/src/w32fns.c b/src/w32fns.c
index cef2009d7a1..88141893445 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4353,9 +4353,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
      specbind (Qx_resource_name, name);
    }
-  f->resx = dpyinfo->resx;
-  f->resy = dpyinfo->resy;
  if (uniscribe_available)
    register_font_driver (&uniscribe_font_driver, f);
  register_font_driver (&w32font_driver, f);
@@ -5420,9 +5417,6 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
      specbind (Qx_resource_name, name);
    }
-  f->resx = dpyinfo->resx;
-  f->resy = dpyinfo->resy;
  if (uniscribe_available)
    register_font_driver (&uniscribe_font_driver, f);
  register_font_driver (&w32font_driver, f);
@@ -5780,8 +5774,8 @@ Text larger than the specified size is clipped.  */)
  /* Set up the frame's root window.  */
  w = XWINDOW (FRAME_ROOT_WINDOW (f));
-  wset_left_col (w, make_number (0));
+  w->left_col = 0;
-  wset_top_line (w, make_number (0));
+  w->top_line = 0;
  if (CONSP (Vx_max_tooltip_size)
      && INTEGERP (XCAR (Vx_max_tooltip_size))
@@ -5789,13 +5783,13 @@ Text larger than the specified size is clipped.  */)
      && INTEGERP (XCDR (Vx_max_tooltip_size))
      && XINT (XCDR (Vx_max_tooltip_size)) > 0)
    {
-      wset_total_cols (w, XCAR (Vx_max_tooltip_size));
+      w->total_cols = XFASTINT (XCAR (Vx_max_tooltip_size));
-      wset_total_lines (w, XCDR (Vx_max_tooltip_size));
+      w->total_lines = XFASTINT (XCDR (Vx_max_tooltip_size));
    }
  else
    {
-      wset_total_cols (w, make_number (80));
+      w->total_cols = 80;
-      wset_total_lines (w, make_number (40));
+      w->total_lines = 40;
    }
  FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
@@ -5866,7 +5860,7 @@ Text larger than the specified size is clipped.  */)
      /* w->total_cols and FRAME_TOTAL_COLS want the width in columns,
         not in pixels.  */
      width /= WINDOW_FRAME_COLUMN_WIDTH (w);
-      wset_total_cols (w, make_number (width));
+      w->total_cols = width;
      FRAME_TOTAL_COLS (f) = width;
      adjust_glyphs (f);
      w->pseudo_window_p = 1;
@@ -7765,6 +7759,9 @@ emacs_abort (void)
 #endif
            if (stderr_fd >= 0)
              write (stderr_fd, "\r\nBacktrace:\r\n", 14);
+#ifdef CYGWIN
+#define _open open
+#endif
            errfile_fd = _open ("emacs_backtrace.txt", O_RDWR | O_CREAT | O_BINARY, S_IREAD | S_IWRITE);
            if (errfile_fd >= 0)
              {
diff --git a/src/w32font.c b/src/w32font.c
index 5c5a15cc340..fb52376b9e1 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1967,7 +1967,7 @@ static void
 fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
 {
  Lisp_Object tmp, extra;
-  int dpi = FRAME_W32_DISPLAY_INFO (f)->resy;
+  int dpi = FRAME_RES_Y (f);
  tmp = AREF (font_spec, FONT_DPI_INDEX);
  if (INTEGERP (tmp))
diff --git a/src/w32term.c b/src/w32term.c
index 989ceb0f847..5f7952c2ec2 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -109,9 +109,10 @@ struct w32_display_info *x_display_list;
 Lisp_Object w32_display_name_list;
-#if _WIN32_WINNT < 0x0500
+#if _WIN32_WINNT < 0x0500 && !defined(_W64)
 /* Pre Windows 2000, this was not available, but define it here so
-   that Emacs compiled on such a platform will run on newer versions.  */
+   that Emacs compiled on such a platform will run on newer versions.
+   MinGW64 (_W64) defines these unconditionally, so avoid redefining.  */
 typedef struct tagWCRANGE
 {
@@ -5660,8 +5661,6 @@ x_check_fullscreen (struct frame *f)
 static void
 w32fullscreen_hook (FRAME_PTR f)
 {
-  static int normal_width, normal_height;
  if (FRAME_VISIBLE_P (f))
    {
      int width, height, top_pos, left_pos, pixel_height, pixel_width;
@@ -5669,17 +5668,38 @@ w32fullscreen_hook (FRAME_PTR f)
      RECT workarea_rect;
      block_input ();
-      if (normal_height <= 0)
+      /* Record current "normal" dimensions for restoring later.  */
-        normal_height = cur_h;
+      if (!(   FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH
-      if (normal_width <= 0)
+            || FRAME_PREV_FSMODE (f) == FULLSCREEN_MAXIMIZED))
-        normal_width = cur_w;
+        {
+          if (FRAME_PREV_FSMODE (f) != FULLSCREEN_HEIGHT)
+            {
+              FRAME_NORMAL_HEIGHT (f) = cur_h;
+              FRAME_NORMAL_TOP (f) = f->top_pos;
+            }
+          if (FRAME_PREV_FSMODE (f) != FULLSCREEN_WIDTH)
+            {
+              FRAME_NORMAL_WIDTH (f)  = cur_w;
+              FRAME_NORMAL_LEFT (f) = f->left_pos;
+            }
+        }
+      eassert (FRAME_NORMAL_HEIGHT (f) > 0);
+      eassert (FRAME_NORMAL_WIDTH (f) > 0);
      x_real_positions (f, &f->left_pos, &f->top_pos);
      x_fullscreen_adjust (f, &width, &height, &top_pos, &left_pos);
      SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0);
      pixel_height = workarea_rect.bottom - workarea_rect.top;
      pixel_width  = workarea_rect.right  - workarea_rect.left;
+      /* Need to send SC_RESTORE to the window, in case we are
+         resizing from FULLSCREEN_MAXIMIZED.  Otherwise, the mouse
+         resize hints will not be shown by the window manager when the
+         mouse pointer hovers over the window edges, becaise the WM
+         will still think the window is maximized.  */
+      if (f->want_fullscreen != FULLSCREEN_BOTH)
+        SendMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_RESTORE, 0);
+      FRAME_PREV_FSMODE (f) = f->want_fullscreen;
      switch (f->want_fullscreen)
        {
        case FULLSCREEN_BOTH:
@@ -5700,8 +5720,7 @@ w32fullscreen_hook (FRAME_PTR f)
          width  =
            FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width)
            - FRAME_SCROLL_BAR_COLS (f);
-          if (normal_height > 0)
+          height = FRAME_NORMAL_HEIGHT (f);
-            height = normal_height;
          left_pos = workarea_rect.left;
          break;
        case FULLSCREEN_HEIGHT:
@@ -5709,21 +5728,14 @@ w32fullscreen_hook (FRAME_PTR f)
            FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
            - XINT (Ftool_bar_lines_needed (selected_frame))
            + (NILP (Vmenu_bar_mode) ? 1 : 0);
-          if (normal_width > 0)
+          width = FRAME_NORMAL_WIDTH (f);
-            width = normal_width;
          top_pos = workarea_rect.top;
          break;
        case FULLSCREEN_NONE:
-          if (normal_height > 0)
+          height = FRAME_NORMAL_HEIGHT (f);
-            height = normal_height;
+          width = FRAME_NORMAL_WIDTH (f);
-          else
+          left_pos = FRAME_NORMAL_LEFT (f);
-            normal_height = height;
+          top_pos = FRAME_NORMAL_TOP (f);
-          if (normal_width > 0)
-            width = normal_width;
-          else
-            normal_width = width;
-          /* FIXME: Should restore the original position of the frame.  */
-          top_pos = left_pos = 0;
          break;
        }
@@ -6651,7 +6663,7 @@ w32_initialize (void)
  Fset_input_mode (Qnil, Qnil, make_number (2), Qnil);
  {
-    DWORD input_locale_id = (DWORD) GetKeyboardLayout (0);
+    DWORD input_locale_id = ((DWORD_PTR) GetKeyboardLayout (0) & 0xffffffff);
    w32_keyboard_codepage =
      codepage_for_locale ((LCID) (input_locale_id & 0xffff));
  }
diff --git a/src/w32term.h b/src/w32term.h
index a31c5de193d..b319f0ca592 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -359,6 +359,12 @@ struct w32_output
  /* The background for which the above relief GCs were set up.
     They are changed only when a different background is involved.  */
  unsigned long relief_background;
+  /* Frame geometry and full-screen mode before it was resized by
+     specifying the 'fullscreen' frame parameter.  Used to restore the
+     geometry when 'fullscreen' is reset to nil.  */
+  int normal_width, normal_height, normal_top, normal_left;
+  int prev_fsmode;
 };
 extern struct w32_output w32term_display;
@@ -390,6 +396,13 @@ extern struct w32_output w32term_display;
 #define FRAME_SMALLEST_FONT_HEIGHT(F) \
     FRAME_W32_DISPLAY_INFO(F)->smallest_font_height
+#define FRAME_NORMAL_WIDTH(F)  ((F)->output_data.w32->normal_width)
+#define FRAME_NORMAL_HEIGHT(F) ((F)->output_data.w32->normal_height)
+#define FRAME_NORMAL_TOP(F)    ((F)->output_data.w32->normal_top)
+#define FRAME_NORMAL_LEFT(F)   ((F)->output_data.w32->normal_left)
+#define FRAME_PREV_FSMODE(F)   ((F)->output_data.w32->prev_fsmode)
 /* W32-specific scroll bar stuff.  */
diff --git a/src/window.c b/src/window.c
index c987d08534e..a2e6a5a0602 100644
--- a/src/window.c
+++ b/src/window.c
@@ -85,8 +85,8 @@ 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 *, int);
+static int window_resize_check (struct window *, bool);
-static void window_resize_apply (struct window *, int);
+static void window_resize_apply (struct window *, bool);
 static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
 static void select_window_1 (Lisp_Object, bool);
@@ -636,30 +636,37 @@ Return nil if WINDOW has no previous sibling.  */)
 DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
       doc: /* Return combination limit of window WINDOW.
+WINDOW must be a valid window used in horizontal or vertical combination.
 If the return value is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  A return value of t means that child windows of
-WINDOW are never \(re-)combined with WINDOW's siblings.
+WINDOW are never \(re-)combined with WINDOW's siblings.  */)
-WINDOW must be a valid window.  The return value is meaningful for
-internal windows only.  */)
  (Lisp_Object window)
 {
+  struct window *w;
  CHECK_VALID_WINDOW (window);
+  w = XWINDOW (window);
+  if (!NILP (w->buffer))
+    error ("Combination limit is meaningful for internal windows only");
  return XWINDOW (window)->combination_limit;
 }
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
       doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
+WINDOW must be a valid window used in horizontal or vertical combination.
 If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's
 siblings.  LIMIT t means that child windows of WINDOW are never
 \(re-)combined with WINDOW's siblings.  Other values are reserved for
-future use.
+future use.  */)
-WINDOW must be a valid window.  Setting the combination limit is
-meaningful for internal windows only.  */)
  (Lisp_Object window, Lisp_Object limit)
 {
-  wset_combination_limit (decode_valid_window (window), limit);
+  struct window *w;
+  CHECK_VALID_WINDOW (window);
+  w = XWINDOW (window);
+  if (!NILP (w->buffer))
+    error ("Combination limit is meaningful for internal windows only");
+  wset_combination_limit (w, limit);
  return limit;
 }
@@ -686,7 +693,7 @@ On a graphical display, this total height is reported as an
 integer multiple of the default character height.  */)
  (Lisp_Object window)
 {
-  return decode_valid_window (window)->total_lines;
+  return make_number (decode_valid_window (window)->total_lines);
 }
 DEFUN ("window-total-width", Fwindow_total_width, Swindow_total_width, 0, 1, 0,
@@ -701,7 +708,7 @@ On a graphical display, this total width is reported as an
 integer multiple of the default character width.  */)
  (Lisp_Object window)
 {
-  return decode_valid_window (window)->total_cols;
+  return make_number (decode_valid_window (window)->total_cols);
 }
 DEFUN ("window-new-total", Fwindow_new_total, Swindow_new_total, 0, 1, 0,
@@ -740,7 +747,7 @@ value is 0 if there is no window to the left of WINDOW.
 WINDOW must be a valid window and defaults to the selected one.  */)
  (Lisp_Object window)
 {
-  return decode_valid_window (window)->left_col;
+  return make_number (decode_valid_window (window)->left_col);
 }
 DEFUN ("window-top-line", Fwindow_top_line, Swindow_top_line, 0, 1, 0,
@@ -752,7 +759,7 @@ there is no window above WINDOW.
 WINDOW must be a valid window and defaults to the selected one.  */)
  (Lisp_Object window)
 {
-  return decode_valid_window (window)->top_line;
+  return make_number (decode_valid_window (window)->top_line);
 }
 /* Return the number of lines of W's body.  Don't count any mode or
@@ -761,7 +768,7 @@ WINDOW must be a valid window and defaults to the selected one.  */)
 static int
 window_body_lines (struct window *w)
 {
-  int height = XFASTINT (w->total_lines);
+  int height = w->total_lines;
  if (!MINI_WINDOW_P (w))
    {
@@ -783,7 +790,7 @@ int
 window_body_cols (struct window *w)
 {
  struct frame *f = XFRAME (WINDOW_FRAME (w));
-  int width = XINT (w->total_cols);
+  int width = w->total_cols;
  if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
    /* Scroll bars occupy a few columns.  */
@@ -1369,7 +1376,7 @@ check_window_containing (struct window *w, void *user_data)
 Lisp_Object
 window_from_coordinates (struct frame *f, int x, int y,
-                         enum window_part *part, int tool_bar_p)
+                         enum window_part *part, bool tool_bar_p)
 {
  Lisp_Object window;
  struct check_window_data cw;
@@ -2001,12 +2008,12 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag)
  if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame))))
    fset_root_window (XFRAME (o->frame), new);
-   if (setflag)
+  if (setflag)
-     {
+    {
-      wset_left_col (n, o->left_col);
+      n->left_col = o->left_col;
-      wset_top_line (n, o->top_line);
+      n->top_line = o->top_line;
-      wset_total_cols (n, o->total_cols);
+      n->total_cols = o->total_cols;
-      wset_total_lines (n, o->total_lines);
+      n->total_lines = o->total_lines;
      wset_normal_cols (n, o->normal_cols);
      wset_normal_cols (o, make_float (1.0));
      wset_normal_lines (n, o->normal_lines);
@@ -2056,7 +2063,7 @@ recombine_windows (Lisp_Object window)
 {
  struct window *w, *p, *c;
  Lisp_Object parent, child;
-  int horflag;
+  bool horflag;
  w = XWINDOW (window);
  parent = w->parent;
@@ -2091,12 +2098,12 @@ recombine_windows (Lisp_Object window)
              if (horflag)
                wset_normal_cols (c,
-                                  make_float (XFLOATINT (c->total_cols)
+                                  make_float ((double) c->total_cols
-                                              / XFLOATINT (p->total_cols)));
+                                              / (double) p->total_cols));
              else
                wset_normal_lines (c,
-                                   make_float (XFLOATINT (c->total_lines)
+                                   make_float ((double) c->total_lines
-                                               / XFLOATINT (p->total_lines)));
+                                               / (double) p->total_lines));
              if (NILP (c->next))
                {
@@ -2855,9 +2862,8 @@ window-start value is reasonable when this function is called.  */)
  if (NILP (w->buffer))
    {
      /* Resize child windows vertically.  */
-      XSETINT (delta, XINT (r->total_lines)
+      XSETINT (delta, r->total_lines - w->total_lines);
-               - XINT (w->total_lines));
+      w->top_line = r->top_line;
-      wset_top_line (w, r->top_line);
      resize_root_window (window, delta, Qnil, Qnil);
      if (window_resize_check (w, 0))
        window_resize_apply (w, 0);
@@ -2873,10 +2879,8 @@ window-start value is reasonable when this function is called.  */)
      /* Resize child windows horizontally.  */
      if (!resize_failed)
        {
-          wset_left_col (w, r->left_col);
+          w->left_col = r->left_col;
-          XSETINT (delta,
+          XSETINT (delta, r->total_cols - w->total_cols);
-                   XINT (r->total_cols) - XINT (w->total_cols));
-          wset_left_col (w, r->left_col);
          resize_root_window (window, delta, Qt, Qnil);
          if (window_resize_check (w, 1))
            window_resize_apply (w, 1);
@@ -3149,7 +3153,8 @@ If FRAME is omitted or nil, it defaults to the selected frame.  */)
   reset from the buffer's local settings.  */
 void
-set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int keep_margins_p)
+set_window_buffer (Lisp_Object window, Lisp_Object buffer,
+                   bool run_hooks_p, bool keep_margins_p)
 {
  struct window *w = XWINDOW (window);
  struct buffer *b = XBUFFER (buffer);
@@ -3407,7 +3412,7 @@ temp_output_buffer_show (register Lisp_Object buf)
   WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only
   horizontal child).   */
 static void
-make_parent_window (Lisp_Object window, int horflag)
+make_parent_window (Lisp_Object window, bool horflag)
 {
  Lisp_Object parent;
  register struct window *o, *p;
@@ -3446,10 +3451,6 @@ make_window (void)
  w = allocate_window ();
  /* Initialize Lisp data.  Note that allocate_window initializes all
     Lisp data to nil, so do it only for slots which should not be nil.  */
-  wset_left_col (w, make_number (0));
-  wset_top_line (w, make_number (0));
-  wset_total_lines (w, make_number (0));
-  wset_total_cols (w, make_number (0));
  wset_normal_lines (w, make_float (1.0));
  wset_normal_cols (w, make_float (1.0));
  wset_new_total (w, make_number (0));
@@ -3520,7 +3521,7 @@ Note: This function does not operate on any child windows of WINDOW.  */)
   `window-min-height' or `window-min-width'.  It does check that window
   sizes do not drop below one line (two columns). */
 static int
-window_resize_check (struct window *w, int horflag)
+window_resize_check (struct window *w, bool horflag)
 {
  struct window *c;
@@ -3601,7 +3602,7 @@ window_resize_check (struct window *w, int horflag)
   This function does not perform any error checks.  Make sure you have
   run window_resize_check on W before applying this function.  */
 static void
-window_resize_apply (struct window *w, int horflag)
+window_resize_apply (struct window *w, bool horflag)
 {
  struct window *c;
  int pos;
@@ -3610,19 +3611,19 @@ window_resize_apply (struct window *w, int horflag)
     parent window has been set *before*.  */
  if (horflag)
    {
-      wset_total_cols (w, w->new_total);
+      w->total_cols = XFASTINT (w->new_total);
      if (NUMBERP (w->new_normal))
        wset_normal_cols (w, w->new_normal);
-      pos = XINT (w->left_col);
+      pos = w->left_col;
    }
  else
    {
-      wset_total_lines (w, w->new_total);
+      w->total_lines = XFASTINT (w->new_total);
      if (NUMBERP (w->new_normal))
        wset_normal_lines (w, w->new_normal);
-      pos = XINT (w->top_line);
+      pos = w->top_line;
    }
  if (!NILP (w->vchild))
@@ -3632,12 +3633,12 @@ window_resize_apply (struct window *w, int horflag)
      while (c)
        {
          if (horflag)
-            wset_left_col (c, make_number (pos));
+            c->left_col = pos;
          else
-            wset_top_line (c, make_number (pos));
+            c->top_line = pos;
          window_resize_apply (c, horflag);
          if (!horflag)
-            pos = pos + XINT (c->total_lines);
+            pos = pos + c->total_lines;
          c = NILP (c->next) ? 0 : XWINDOW (c->next);
        }
    }
@@ -3648,12 +3649,12 @@ window_resize_apply (struct window *w, int horflag)
      while (c)
        {
          if (horflag)
-            wset_left_col (c, make_number (pos));
+            c->left_col = pos;
          else
-            wset_top_line (c, make_number (pos));
+            c->top_line = pos;
          window_resize_apply (c, horflag);
          if (horflag)
-            pos = pos + XINT (c->total_cols);
+            pos = pos + c->total_cols;
          c = NILP (c->next) ? 0 : XWINDOW (c->next);
        }
    }
@@ -3682,11 +3683,11 @@ be applied on the Elisp level.  */)
 {
  struct frame *f = decode_live_frame (frame);
  struct window *r = XWINDOW (FRAME_ROOT_WINDOW (f));
-  int horflag = !NILP (horizontal);
+  bool horflag = !NILP (horizontal);
  if (!window_resize_check (r, horflag)
-      || ! EQ (r->new_total,
+      || (XINT (r->new_total)
-               (horflag ? r->total_cols : r->total_lines)))
+          != (horflag ? r->total_cols : r->total_lines)))
    return Qnil;
  block_input ();
@@ -3712,7 +3713,7 @@ be applied on the Elisp level.  */)
   satisfy the request.  The result will be meaningful if and only if
   F's windows have meaningful sizes when you call this.  */
 void
-resize_frame_windows (struct frame *f, int size, int horflag)
+resize_frame_windows (struct frame *f, int size, bool horflag)
 {
  Lisp_Object root = f->root_window;
  struct window *r = XWINDOW (root);
@@ -3726,18 +3727,17 @@ resize_frame_windows (struct frame *f, int size, int horflag)
                     - ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
                        ? 1 : 0)));
-  wset_top_line (r, make_number (FRAME_TOP_MARGIN (f)));
+  r->top_line = FRAME_TOP_MARGIN (f);
  if (NILP (r->vchild) && NILP (r->hchild))
    /* For a leaf root window just set the size.  */
    if (horflag)
-      wset_total_cols (r, make_number (new_size));
+      r->total_cols = new_size;
    else
-      wset_total_lines (r, make_number (new_size));
+      r->total_lines = new_size;
  else
    {
      /* old_size is the old size of the frame's root window.  */
-      int old_size = XFASTINT (horflag ? r->total_cols
+      int old_size = horflag ? r->total_cols : r->total_lines;
-                               : r->total_lines);
      Lisp_Object delta;
      XSETINT (delta, new_size - old_size);
@@ -3767,9 +3767,9 @@ resize_frame_windows (struct frame *f, int size, int horflag)
                  root = f->selected_window;
                  Fdelete_other_windows_internal (root, Qnil);
                  if (horflag)
-                    wset_total_cols (XWINDOW (root), make_number (new_size));
+                    XWINDOW (root)->total_cols = new_size;
                  else
-                    wset_total_lines (XWINDOW (root), make_number (new_size));
+                    XWINDOW (root)->total_lines = new_size;
                }
            }
        }
@@ -3779,13 +3779,12 @@ resize_frame_windows (struct frame *f, int size, int horflag)
    {
      m = XWINDOW (mini);
      if (horflag)
-        wset_total_cols (m, make_number (size));
+        m->total_cols = size;
      else
        {
          /* Are we sure we always want 1 line here?  */
-          wset_total_lines (m, make_number (1));
+          m->total_lines = 1;
-          wset_top_line
+          m->top_line = r->top_line + r->total_lines;
-            (m, make_number (XINT (r->top_line) + XINT (r->total_lines)));
        }
    }
@@ -3826,7 +3825,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
  register Lisp_Object new, frame, reference;
  register struct window *o, *p, *n, *r;
  struct frame *f;
-  int horflag
+  bool horflag
    /* HORFLAG is 1 when we split side-by-side, 0 otherwise.  */
    = EQ (side, Qt) || EQ (side, Qleft) || EQ (side, Qright);
  int combination_limit = 0;
@@ -3869,20 +3868,21 @@ set correctly.  See the code of `split-window' for how this is done.  */)
      p = XWINDOW (o->parent);
      /* Temporarily pretend we split the parent window.  */
      wset_new_total
-        (p, make_number (XINT (horflag ? p->total_cols : p->total_lines)
+        (p, make_number ((horflag ? p->total_cols : p->total_lines)
                         - XINT (total_size)));
      if (!window_resize_check (p, horflag))
        error ("Window sizes don't fit");
      else
        /* Undo the temporary pretension.  */
-        wset_new_total (p, horflag ? p->total_cols : p->total_lines);
+        wset_new_total (p, make_number
+                        (horflag ? p->total_cols : p->total_lines));
    }
  else
    {
      if (!window_resize_check (o, horflag))
        error ("Resizing old window failed");
      else if (XINT (total_size) + XINT (o->new_total)
-               != XINT (horflag ? o->total_cols : o->total_lines))
+               != (horflag ? o->total_cols : o->total_lines))
        error ("Sum of sizes of old and new window don't fit");
    }
@@ -3902,7 +3902,8 @@ set correctly.  See the code of `split-window' for how this is done.  */)
           that its children get merged into another window.  */
        wset_combination_limit (p, Qt);
      /* These get applied below.  */
-      wset_new_total (p, horflag ? o->total_cols : o->total_lines);
+      wset_new_total (p, make_number
+                      (horflag ? o->total_cols : o->total_lines));
      wset_new_normal (p, new_normal);
    }
  else
@@ -3954,13 +3955,13 @@ set correctly.  See the code of `split-window' for how this is done.  */)
  /* Directly assign orthogonal coordinates and sizes.  */
  if (horflag)
    {
-      wset_top_line (n, o->top_line);
+      n->top_line = o->top_line;
-      wset_total_lines (n, o->total_lines);
+      n->total_lines = o->total_lines;
    }
  else
    {
-      wset_left_col (n, o->left_col);
+      n->left_col = o->left_col;
-      wset_total_cols (n, o->total_cols);
+      n->total_cols = o->total_cols;
    }
  /* Iso-coordinates and sizes are assigned by window_resize_apply,
@@ -3995,7 +3996,7 @@ Signal an error when WINDOW is the only window on its frame.  */)
  register Lisp_Object parent, sibling, frame, root;
  struct window *w, *p, *s, *r;
  struct frame *f;
-  int horflag;
+  bool horflag;
  int before_sibling = 0;
  w = decode_any_window (window);
@@ -4049,8 +4050,8 @@ Signal an error when WINDOW is the only window on its frame.  */)
    }
  if (window_resize_check (r, horflag)
-      && EQ (r->new_total,
+      && (XINT (r->new_total)
-             (horflag ? r->total_cols : r->total_lines)))
+          == (horflag ? r->total_cols : r->total_lines)))
    /* We can delete WINDOW now.  */
    {
@@ -4199,10 +4200,8 @@ grow_mini_window (struct window *w, int delta)
      window_resize_apply (r, 0);
      /* Grow the mini-window.  */
-      wset_top_line
+      w->top_line = r->top_line + r->total_lines;
-        (w, make_number (XFASTINT (r->top_line) + XFASTINT (r->total_lines)));
+      w->total_lines -= XINT (value);
-      wset_total_lines
-        (w, make_number (XFASTINT (w->total_lines) - XINT (value)));
      w->last_modified = 0;
      w->last_overlay_modified = 0;
@@ -4224,7 +4223,7 @@ shrink_mini_window (struct window *w)
  eassert (MINI_WINDOW_P (w));
-  size = XINT (w->total_lines);
+  size = w->total_lines;
  if (size > 1)
    {
      root = FRAME_ROOT_WINDOW (f);
@@ -4237,9 +4236,8 @@ shrink_mini_window (struct window *w)
          window_resize_apply (r, 0);
          /* Shrink the mini-window.  */
-          wset_top_line (w, make_number (XFASTINT (r->top_line)
+          w->top_line = r->top_line + r->total_lines;
-                                         + XFASTINT (r->total_lines)));
+          w->total_lines = 1;
-          wset_total_lines (w, make_number (1));
          w->last_modified = 0;
          w->last_overlay_modified = 0;
@@ -4273,7 +4271,7 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
    error ("Cannot resize a minibuffer-only frame");
  r = XWINDOW (FRAME_ROOT_WINDOW (f));
-  height = XINT (r->total_lines) + XINT (w->total_lines);
+  height = r->total_lines + w->total_lines;
  if (window_resize_check (r, 0)
      && XINT (w->new_total) > 0
      && height == XINT (r->new_total) + XINT (w->new_total))
@@ -4281,9 +4279,8 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
      block_input ();
      window_resize_apply (r, 0);
-      wset_total_lines (w, w->new_total);
+      w->total_lines = XFASTINT (w->new_total);
-      wset_top_line (w, make_number (XINT (r->top_line)
+      w->top_line = r->top_line + r->total_lines;
-                                     + XINT (r->total_lines)));
      windows_or_buffers_changed++;
      FRAME_WINDOW_SIZES_CHANGED (f) = 1;
@@ -4323,7 +4320,7 @@ mark_window_cursors_off (struct window *w)
 int
 window_internal_height (struct window *w)
 {
-  int ht = XFASTINT (w->total_lines);
+  int ht = w->total_lines;
  if (!MINI_WINDOW_P (w))
    {
@@ -4633,7 +4630,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
     even if there is a header line.  */
  this_scroll_margin = max (0, scroll_margin);
  this_scroll_margin
-    = min (this_scroll_margin, XFASTINT (w->total_lines) / 4);
+    = min (this_scroll_margin, w->total_lines / 4);
  this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
  if (n > 0)
@@ -4810,7 +4807,7 @@ window_scroll_line_based (Lisp_Object window, int n, int whole, int noerror)
    {
      /* Don't use a scroll margin that is negative or too large.  */
      int this_scroll_margin =
-        max (0, min (scroll_margin, XINT (w->total_lines) / 4));
+        max (0, min (scroll_margin, w->total_lines / 4));
      set_marker_restricted_both (w->start, w->buffer, pos, pos_byte);
      w->start_at_line_beg = !NILP (bolp);
@@ -5227,7 +5224,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
  /* Do this after making BUF current
     in case scroll_margin is buffer-local.  */
  this_scroll_margin =
-    max (0, min (scroll_margin, XFASTINT (w->total_lines) / 4));
+    max (0, min (scroll_margin, w->total_lines / 4));
  /* Handle centering on a graphical frame specially.  Such frames can
     have variable-height lines and centering point on the basis of
@@ -5701,7 +5698,7 @@ the return value is nil.  Otherwise the value is t.  */)
              wset_prev (w, Qnil);
              if (!NILP (w->parent))
                {
-                  if (EQ (p->total_cols, XWINDOW (w->parent)->total_cols))
+                  if (XINT (p->total_cols) == XWINDOW (w->parent)->total_cols)
                    {
                      wset_vchild (XWINDOW (w->parent), p->window);
                      wset_hchild (XWINDOW (w->parent), Qnil);
@@ -5714,14 +5711,13 @@ the return value is nil.  Otherwise the value is t.  */)
                }
            }
-          /* If we squirreled away the buffer in the window's height,
+          /* If we squirreled away the buffer, restore it now.  */
-             restore it now.  */
+          if (BUFFERP (w->combination_limit))
-          if (BUFFERP (w->total_lines))
+            wset_buffer (w, w->combination_limit);
-            wset_buffer (w, w->total_lines);
+          w->left_col = XFASTINT (p->left_col);
-          wset_left_col (w, p->left_col);
+          w->top_line = XFASTINT (p->top_line);
-          wset_top_line (w, p->top_line);
+          w->total_cols = XFASTINT (p->total_cols);
-          wset_total_cols (w, p->total_cols);
+          w->total_lines = XFASTINT (p->total_lines);
-          wset_total_lines (w, p->total_lines);
          wset_normal_cols (w, p->normal_cols);
          wset_normal_lines (w, p->normal_lines);
          w->hscroll = XFASTINT (p->hscroll);
@@ -5921,9 +5917,6 @@ delete_all_child_windows (Lisp_Object window)
    /* Delete WINDOW's siblings (we traverse postorderly).  */
    delete_all_child_windows (w->next);
-  /* See Fset_window_configuration for excuse.  */
-  wset_total_lines (w, w->buffer);
  if (!NILP (w->vchild))
    {
      delete_all_child_windows (w->vchild);
@@ -5939,6 +5932,10 @@ delete_all_child_windows (Lisp_Object window)
      unshow_buffer (w);
      unchain_marker (XMARKER (w->pointm));
      unchain_marker (XMARKER (w->start));
+      /* Since combination limit makes sense for an internal windows
+         only, we use this slot to save the buffer for the sake of
+         possible resurrection in Fset_window_configuration.  */
+      wset_combination_limit (w, w->buffer);
      wset_buffer (w, Qnil);
    }
@@ -6009,8 +6006,7 @@ get_phys_cursor_glyph (struct window *w)
        hpos = row->used[TEXT_AREA] - 1;
    }
-  if (row->used[TEXT_AREA] > hpos
+  if (hpos >= 0 && hpos < row->used[TEXT_AREA])
-      && 0 <= hpos)
    glyph = row->glyphs[TEXT_AREA] + hpos;
  else
    glyph = NULL;
@@ -6034,10 +6030,10 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
      wset_temslot (w, make_number (i)); i++;
      p->window = window;
      p->buffer = w->buffer;
-      p->left_col = w->left_col;
+      p->left_col = make_number (w->left_col);
-      p->top_line = w->top_line;
+      p->top_line = make_number (w->top_line);
-      p->total_cols = w->total_cols;
+      p->total_cols = make_number (w->total_cols);
-      p->total_lines = w->total_lines;
+      p->total_lines = make_number (w->total_lines);
      p->normal_cols = w->normal_cols;
      p->normal_lines = w->normal_lines;
      XSETFASTINT (p->hscroll, w->hscroll);
@@ -6531,7 +6527,7 @@ freeze_window_start (struct window *w, void *freeze_p)
   means freeze the window start.  */
 void
-freeze_window_starts (struct frame *f, int freeze_p)
+freeze_window_starts (struct frame *f, bool freeze_p)
 {
  foreach_window (f, freeze_window_start, (void *) (freeze_p ? f : 0));
 }
diff --git a/src/window.h b/src/window.h
index dcef37abb4c..71c438ff7f2 100644
--- a/src/window.h
+++ b/src/window.h
@@ -112,20 +112,14 @@ struct window
    /* The window this one is a child of.  */
    Lisp_Object parent;
-    /* The upper left corner coordinates of this window, as integers
+    /* The normal size of the window.  These are fractions, but we do
-       relative to upper left corner of frame = 0, 0.  */
+       not use C doubles to avoid creating new Lisp_Float objects while
-    Lisp_Object left_col;
+       interfacing Lisp in Fwindow_normal_size.  */
-    Lisp_Object top_line;
-    /* The size of the window.  */
-    Lisp_Object total_lines;
-    Lisp_Object total_cols;
-    /* The normal size of the window.  */
    Lisp_Object normal_lines;
    Lisp_Object normal_cols;
-    /* New sizes of the window.  */
+    /* New sizes of the window.  Note that Lisp code may set new_normal
+       to something beyond an integer, so C int can't be used here.  */
    Lisp_Object new_total;
    Lisp_Object new_normal;
@@ -221,6 +215,15 @@ struct window
    /* Number saying how recently window was selected.  */
    int use_time;
+    /* The upper left corner coordinates of this window,
+       relative to upper left corner of frame = 0, 0.  */
+    int left_col;
+    int top_line;
+    /* The size of the window.  */
+    int total_lines;
+    int total_cols;
    /* Number of columns display within the window is scrolled to the left.  */
    ptrdiff_t hscroll;
@@ -354,11 +357,6 @@ wset_frame (struct window *w, Lisp_Object val)
  w->frame = val;
 }
 WINDOW_INLINE void
-wset_left_col (struct window *w, Lisp_Object val)
-{
-  w->left_col = val;
-}
-WINDOW_INLINE void
 wset_next (struct window *w, Lisp_Object val)
 {
  w->next = val;
@@ -374,21 +372,6 @@ wset_redisplay_end_trigger (struct window *w, Lisp_Object val)
  w->redisplay_end_trigger = val;
 }
 WINDOW_INLINE void
-wset_top_line (struct window *w, Lisp_Object val)
-{
-  w->top_line = val;
-}
-WINDOW_INLINE void
-wset_total_cols (struct window *w, Lisp_Object val)
-{
-  w->total_cols = val;
-}
-WINDOW_INLINE void
-wset_total_lines (struct window *w, Lisp_Object val)
-{
-  w->total_lines = val;
-}
-WINDOW_INLINE void
 wset_vertical_scroll_bar (struct window *w, Lisp_Object val)
 {
  w->vertical_scroll_bar = val;
@@ -461,14 +444,12 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 /* Return the width of window W in canonical column units.
   This includes scroll bars and fringes.  */
-#define WINDOW_TOTAL_COLS(W) \
+#define WINDOW_TOTAL_COLS(W) (W)->total_cols
-  (XFASTINT (W->total_cols))
 /* Return the height of window W in canonical line units.
   This includes header and mode lines, if any.  */
-#define WINDOW_TOTAL_LINES(W) \
+#define WINDOW_TOTAL_LINES(W) (W)->total_lines
-  (XFASTINT (W->total_lines))
 /* Return the total pixel width of window W.  */
@@ -495,8 +476,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 /* Return the canonical frame column at which window W starts.
   This includes a left-hand scroll bar, if any.  */
-#define WINDOW_LEFT_EDGE_COL(W) \
+#define WINDOW_LEFT_EDGE_COL(W) (W)->left_col
-  (XFASTINT (W->left_col))
 /* Return the canonical frame column before which window W ends.
   This includes a right-hand scroll bar, if any.  */
@@ -507,8 +487,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 /* Return the canonical frame line at which window W starts.
   This includes a header line, if any.  */
-#define WINDOW_TOP_EDGE_LINE(W) \
+#define WINDOW_TOP_EDGE_LINE(W) (W)->top_line
-  (XFASTINT (W->top_line))
 /* Return the canonical frame line before which window W ends.
   This includes a mode line, if any.  */
@@ -533,9 +512,14 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 /* 1 if W is a menu bar window.  */
+#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #define WINDOW_MENU_BAR_P(W) \
  (WINDOWP (WINDOW_XFRAME (W)->menu_bar_window) \
   && (W) == XWINDOW (WINDOW_XFRAME (W)->menu_bar_window))
+#else
+/* No menu bar windows if X toolkit is in use.  */
+#define WINDOW_MENU_BAR_P(W) (0)
+#endif
 /* 1 if W is a tool bar window.  */
@@ -891,10 +875,10 @@ extern Lisp_Object Vmouse_event;
 extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
-                                            enum window_part *, int);
+                                            enum window_part *, bool);
-extern void resize_frame_windows (struct frame *, int, int);
+extern void resize_frame_windows (struct frame *, int, bool);
 extern void delete_all_child_windows (Lisp_Object);
-extern void freeze_window_starts (struct frame *, int);
+extern void freeze_window_starts (struct frame *, bool);
 extern void grow_mini_window (struct window *, int);
 extern void shrink_mini_window (struct window *);
 extern int window_relative_x_coord (struct window *, enum window_part, int);
@@ -906,7 +890,7 @@ void run_window_configuration_change_hook (struct frame *f);
   it's not allowed.  */
 void set_window_buffer (Lisp_Object window, Lisp_Object buffer,
-                        int run_hooks_p, int keep_margins_p);
+                        bool run_hooks_p, bool keep_margins_p);
 /* This is the window where the echo area message was displayed.  It
   is always a minibuffer window, but it may not be the same window
diff --git a/src/xdisp.c b/src/xdisp.c
index b60b393e614..bd68b286f4e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -984,7 +984,7 @@ window_text_bottom_y (struct window *w)
 int
 window_box_width (struct window *w, int area)
 {
-  int cols = XFASTINT (w->total_cols);
+  int cols = w->total_cols;
  int pixels = 0;
  if (!w->pseudo_window_p)
@@ -2682,7 +2682,7 @@ init_iterator (struct it *it, struct window *w,
     and IT->region_end_charpos to the start and end of a visible region
     in window IT->w.  Set both to -1 to indicate no region.  */
  markpos = markpos_of_region ();
-  if (0 <= markpos
+  if (markpos >= 0
      /* Maybe highlight only in selected window.  */
      && (/* Either show region everywhere.  */
          highlight_nonselected_windows
@@ -13231,8 +13231,8 @@ redisplay_internal (void)
               PT == w->last_point
               /* Make sure the cursor was last displayed
                  in this window.  Otherwise we have to reposition it.  */
-               && 0 <= w->cursor.vpos
+               && w->cursor.vpos >= 0
-               && WINDOW_TOTAL_LINES (w) > w->cursor.vpos)
+               && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
        {
          if (!must_finish)
            {
@@ -15581,7 +15581,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
          /* If we are highlighting the region, then we just changed
             the region, so redisplay to show it.  */
-          if (0 <= markpos_of_region ())
+          if (markpos_of_region () >= 0)
            {
              clear_glyph_matrix (w->desired_matrix);
              if (!try_window (window, startp, 0))
@@ -16296,7 +16296,7 @@ try_window_reusing_current_matrix (struct window *w)
    return 0;
  /* Can't do this if region may have changed.  */
-  if (0 <= markpos_of_region ()
+  if (markpos_of_region () >= 0
      || w->region_showing
      || !NILP (Vshow_trailing_whitespace))
    return 0;
@@ -17135,7 +17135,7 @@ try_window_id (struct window *w)
  /* Can't use this if highlighting a region because a cursor movement
     will do more than just set the cursor.  */
-  if (0 <= markpos_of_region ())
+  if (markpos_of_region () >= 0)
    GIVE_UP (9);
  /* Likewise if highlighting trailing whitespace.  */
@@ -20093,18 +20093,17 @@ display_menu_bar (struct window *w)
    return;
 #endif /* HAVE_NS */
-#ifdef USE_X_TOOLKIT
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
  eassert (!FRAME_WINDOW_P (f));
  init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID);
  it.first_visible_x = 0;
  it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
-#else /* not USE_X_TOOLKIT */
+#elif defined (HAVE_X_WINDOWS) /* X without toolkit.  */
  if (FRAME_WINDOW_P (f))
    {
      /* Menu bar lines are displayed in the desired matrix of the
         dummy window menu_bar_window.  */
      struct window *menu_w;
-      eassert (WINDOWP (f->menu_bar_window));
      menu_w = XWINDOW (f->menu_bar_window);
      init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows,
                     MENU_FACE_ID);
@@ -20112,6 +20111,7 @@ display_menu_bar (struct window *w)
      it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
    }
  else
+#endif /* not USE_X_TOOLKIT and not USE_GTK */
    {
      /* This is a TTY frame, i.e. character hpos/vpos are used as
         pixel x/y.  */
@@ -20120,7 +20120,6 @@ display_menu_bar (struct window *w)
      it.first_visible_x = 0;
      it.last_visible_x = FRAME_COLS (f);
    }
-#endif /* not USE_X_TOOLKIT */
  /* FIXME: This should be controlled by a user option.  See the
     comments in redisplay_tool_bar and display_mode_line about
@@ -21114,7 +21113,7 @@ pint2hrstr (char *buf, int width, ptrdiff_t d)
  char * psuffix;
  char * p;
-  if (1000 <= quotient)
+  if (quotient >= 1000)
    {
      /* Scale to the appropriate EXPONENT. */
      do
@@ -21123,13 +21122,13 @@ pint2hrstr (char *buf, int width, ptrdiff_t d)
          quotient /= 1000;
          exponent++;
        }
-      while (1000 <= quotient);
+      while (quotient >= 1000);
      /* Round to nearest and decide whether to use TENTHS or not. */
      if (quotient <= 9)
        {
          tenths = remainder / 100;
-          if (50 <= remainder % 100)
+          if (remainder % 100 >= 50)
            {
              if (tenths < 9)
                tenths++;
@@ -21144,7 +21143,7 @@ pint2hrstr (char *buf, int width, ptrdiff_t d)
            }
        }
      else
-        if (500 <= remainder)
+        if (remainder >= 500)
          {
            if (quotient < 999)
              quotient++;
@@ -22187,11 +22186,6 @@ else if the text is replaced by an ellipsis.  */)
 */
-#define NUMVAL(X)                               \
-     ((INTEGERP (X) || FLOATP (X))              \
-      ? XFLOATINT (X)                           \
-      : - 1)
 static int
 calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
                            struct font *font, int width_p, int *align_to)
@@ -22222,24 +22216,11 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
            pixels = 0;
          if (pixels > 0)
            {
-              double ppi;
+              double ppi = (width_p ? FRAME_RES_X (it->f)
-#ifdef HAVE_WINDOW_SYSTEM
+                            : FRAME_RES_Y (it->f));
-              if (FRAME_WINDOW_P (it->f)
-                  && (ppi = (width_p
-                             ? FRAME_X_DISPLAY_INFO (it->f)->resx
-                             : FRAME_X_DISPLAY_INFO (it->f)->resy),
-                      ppi > 0))
-                return OK_PIXELS (ppi / pixels);
-#endif
-              if ((ppi = NUMVAL (Vdisplay_pixels_per_inch), ppi > 0)
+              if (ppi > 0)
-                  || (CONSP (Vdisplay_pixels_per_inch)
-                      && (ppi = (width_p
-                                 ? NUMVAL (XCAR (Vdisplay_pixels_per_inch))
-                                 : NUMVAL (XCDR (Vdisplay_pixels_per_inch))),
-                          ppi > 0)))
                return OK_PIXELS (ppi / pixels);
              return 0;
            }
        }
@@ -22522,16 +22503,16 @@ get_char_face_and_encoding (struct frame *f, int c, int face_id,
                            XChar2b *char2b, int display_p)
 {
  struct face *face = FACE_FROM_ID (f, face_id);
+  unsigned code = 0;
  if (face->font)
    {
-      unsigned code = face->font->driver->encode_char (face->font, c);
+      code = face->font->driver->encode_char (face->font, c);
-      if (code != FONT_INVALID_CODE)
+      if (code == FONT_INVALID_CODE)
-        STORE_XCHAR2B (char2b, (code >> 8), (code & 0xFF));
+        code = 0;
-      else
-        STORE_XCHAR2B (char2b, 0, 0);
    }
+  STORE_XCHAR2B (char2b, (code >> 8), (code & 0xFF));
  /* Make sure X resources of the face are allocated.  */
 #ifdef HAVE_X_WINDOWS
@@ -22555,31 +22536,30 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph,
                             XChar2b *char2b, int *two_byte_p)
 {
  struct face *face;
+  unsigned code = 0;
  eassert (glyph->type == CHAR_GLYPH);
  face = FACE_FROM_ID (f, glyph->face_id);
+  /* Make sure X resources of the face are allocated.  */
+  eassert (face != NULL);
+  PREPARE_FACE_FOR_DISPLAY (f, face);
  if (two_byte_p)
    *two_byte_p = 0;
  if (face->font)
    {
-      unsigned code;
      if (CHAR_BYTE8_P (glyph->u.ch))
        code = CHAR_TO_BYTE8 (glyph->u.ch);
      else
        code = face->font->driver->encode_char (face->font, glyph->u.ch);
-      if (code != FONT_INVALID_CODE)
+      if (code == FONT_INVALID_CODE)
-        STORE_XCHAR2B (char2b, (code >> 8), (code & 0xFF));
+        code = 0;
-      else
-        STORE_XCHAR2B (char2b, 0, 0);
    }
-  /* Make sure X resources of the face are allocated.  */
+  STORE_XCHAR2B (char2b, (code >> 8), (code & 0xFF));
-  eassert (face != NULL);
-  PREPARE_FACE_FOR_DISPLAY (f, face);
  return face;
 }
@@ -22902,9 +22882,12 @@ static struct font_metrics *
 get_per_char_metric (struct font *font, XChar2b *char2b)
 {
  static struct font_metrics metrics;
-  unsigned code = (XCHAR2B_BYTE1 (char2b) << 8) | XCHAR2B_BYTE2 (char2b);
+  unsigned code;
-  if (! font || code == FONT_INVALID_CODE)
+  if (! font)
+    return NULL;
+  code = (XCHAR2B_BYTE1 (char2b) << 8) | XCHAR2B_BYTE2 (char2b);
+  if (code == FONT_INVALID_CODE)
    return NULL;
  font->driver->text_extents (font, &code, 1, &metrics);
  return &metrics;
@@ -28750,11 +28733,11 @@ expose_frame (struct frame *f, int x, int y, int w, int h)
 #ifdef HAVE_X_WINDOWS
 #ifndef MSDOS
-#ifndef USE_X_TOOLKIT
+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  if (WINDOWP (f->menu_bar_window))
    mouse_face_overwritten_p
      |= expose_window (XWINDOW (f->menu_bar_window), &r);
-#endif /* not USE_X_TOOLKIT */
+#endif /* not USE_X_TOOLKIT and not USE_GTK */
 #endif
 #endif
@@ -29488,13 +29471,13 @@ init_xdisp (void)
      echo_area_window = minibuf_window;
-      wset_top_line (r, make_number (FRAME_TOP_MARGIN (f)));
+      r->top_line = FRAME_TOP_MARGIN (f);
-      wset_total_lines
+      r->total_lines = FRAME_LINES (f) - 1 - FRAME_TOP_MARGIN (f);
-        (r, make_number (FRAME_LINES (f) - 1 - FRAME_TOP_MARGIN (f)));
+      r->total_cols = FRAME_COLS (f);
-      wset_total_cols (r, make_number (FRAME_COLS (f)));
-      wset_top_line (m, make_number (FRAME_LINES (f) - 1));
+      m->top_line = FRAME_LINES (f) - 1;
-      wset_total_lines (m, make_number (1));
+      m->total_lines = 1;
-      wset_total_cols (m, make_number (FRAME_COLS (f)));
+      m->total_cols = FRAME_COLS (f);
      scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs;
      scratch_glyph_row.glyphs[TEXT_AREA + 1]
diff --git a/src/xfaces.c b/src/xfaces.c
index 71709446c1d..6db6ac7683f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -112,7 +112,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   merging faces of that character, that face is `realized'.  The
   realization process maps face attributes to what is physically
   available on the system where Emacs runs.  The result is a
-   `realized face' in form of a struct face which is stored in the
+   `realized face' in the form of a struct face which is stored in the
   face cache of the frame on which it was realized.
   Face realization is done in the context of the character to display
@@ -1592,7 +1592,7 @@ the face font sort order.  */)
      ASET (v, 0, AREF (font, FONT_FAMILY_INDEX));
      ASET (v, 1, FONT_WIDTH_SYMBOLIC (font));
      point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10,
-                              XFRAME (frame)->resy);
+                              FRAME_RES_Y (XFRAME (frame)));
      ASET (v, 2, make_number (point));
      ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font));
      ASET (v, 4, FONT_SLANT_SYMBOLIC (font));
@@ -2118,7 +2118,7 @@ set_lface_from_font (struct frame *f, Lisp_Object lface,
  if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface)))
    {
-      int pt = PIXEL_TO_POINT (font->pixel_size * 10, f->resy);
+      int pt = PIXEL_TO_POINT (font->pixel_size * 10, FRAME_RES_Y (f));
      eassert (pt > 0);
      ASET (lface, LFACE_HEIGHT_INDEX, make_number (pt));
@@ -3395,21 +3395,22 @@ set_font_frame_param (Lisp_Object frame, Lisp_Object lface)
    }
 }
-/* Get the value of X resource RESOURCE, class CLASS for the display
-   of frame FRAME.  This is here because ordinary `x-get-resource'
-   doesn't take a frame argument.  */
 DEFUN ("internal-face-x-get-resource", Finternal_face_x_get_resource,
-       Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */)
+       Sinternal_face_x_get_resource, 2, 3, 0,
+       doc: /* Get the value of X resource RESOURCE, class CLASS.
+Returned value is for the display of frame FRAME.  If FRAME is not
+specified or nil, use selected frame.  This function exists because
+ordinary `x-get-resource' doesn't take a frame argument.  */)
  (Lisp_Object resource, Lisp_Object class, Lisp_Object frame)
 {
  Lisp_Object value = Qnil;
+  struct frame *f;
  CHECK_STRING (resource);
  CHECK_STRING (class);
-  CHECK_LIVE_FRAME (frame);
+  f = decode_live_frame (frame);
  block_input ();
-  value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
+  value = display_x_get_resource (FRAME_X_DISPLAY_INFO (f),
                                  resource, class, Qnil, Qnil);
  unblock_input ();
  return value;
diff --git a/src/xfns.c b/src/xfns.c
index 100fd81a155..a6a179be97d 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3182,9 +3182,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
      specbind (Qx_resource_name, name);
    }
-  f->resx = dpyinfo->resx;
-  f->resy = dpyinfo->resy;
 #ifdef HAVE_FREETYPE
 #ifdef HAVE_XFT
  register_font_driver (&xftfont_driver, f);
@@ -4325,7 +4322,7 @@ no value of TYPE (always string in the MS Windows case).  */)
             property and those are indeed in 32 bit quantities if format is
             32.  */
-          if (32 < BITS_PER_LONG && actual_format == 32)
+          if (BITS_PER_LONG > 32 && actual_format == 32)
            {
              unsigned long i;
              int  *idata = (int *) tmp_data;
@@ -4631,9 +4628,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
      specbind (Qx_resource_name, name);
    }
-  f->resx = dpyinfo->resx;
-  f->resy = dpyinfo->resy;
  register_font_driver (&xfont_driver, f);
 #ifdef HAVE_FREETYPE
 #ifdef HAVE_XFT
@@ -5027,23 +5021,23 @@ Text larger than the specified size is clipped.  */)
  /* Set up the frame's root window.  */
  w = XWINDOW (FRAME_ROOT_WINDOW (f));
-  wset_left_col (w, make_number (0));
+  w->left_col = 0;
-  wset_top_line (w, make_number (0));
+  w->top_line = 0;
  if (CONSP (Vx_max_tooltip_size)
      && RANGED_INTEGERP (1, XCAR (Vx_max_tooltip_size), INT_MAX)
      && RANGED_INTEGERP (1, XCDR (Vx_max_tooltip_size), INT_MAX))
    {
-      wset_total_cols (w, XCAR (Vx_max_tooltip_size));
+      w->total_cols = XFASTINT (XCAR (Vx_max_tooltip_size));
-      wset_total_lines (w, XCDR (Vx_max_tooltip_size));
+      w->total_lines = XFASTINT (XCDR (Vx_max_tooltip_size));
    }
  else
    {
-      wset_total_cols (w, make_number (80));
+      w->total_cols = 80;
-      wset_total_lines (w, make_number (40));
+      w->total_lines = 40;
    }
-  FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
+  FRAME_TOTAL_COLS (f) = w->total_cols;
  adjust_glyphs (f);
  w->pseudo_window_p = 1;
@@ -5110,7 +5104,7 @@ Text larger than the specified size is clipped.  */)
      /* w->total_cols and FRAME_TOTAL_COLS want the width in columns,
         not in pixels.  */
      width /= WINDOW_FRAME_COLUMN_WIDTH (w);
-      wset_total_cols (w, make_number (width));
+      w->total_cols = width;
      FRAME_TOTAL_COLS (f) = width;
      adjust_glyphs (f);
      clear_glyph_matrix (w->desired_matrix);
diff --git a/src/xmenu.c b/src/xmenu.c
index 958cd220393..af08eeb657c 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1055,7 +1055,7 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
      wv->help = Qnil;
      first_wv = wv;
-      for (i = 0; 0 <= submenu_start[i]; i++)
+      for (i = 0; submenu_start[i] >= 0; i++)
        {
          menu_items_n_panes = submenu_n_panes[i];
          wv = digest_single_submenu (submenu_start[i], submenu_end[i],
@@ -2479,7 +2479,7 @@ xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps,
 #endif
  record_unwind_protect (pop_down_menu,
-                         make_save_value ("pp", f, menu));
+                         make_save_value (SAVE_TYPE_PTR_PTR, f, menu));
  /* Help display under X won't work because XMenuActivate contains
     a loop that doesn't give Emacs a chance to process it.  */
diff --git a/src/xselect.c b/src/xselect.c
index 5b90d7def22..cca1a47212b 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1388,7 +1388,7 @@ x_get_window_property (Display *display, Window window, Atom property,
          data = data1;
        }
-      if (32 < BITS_PER_LONG && *actual_format_ret == 32)
+      if (BITS_PER_LONG > 32 && *actual_format_ret == 32)
        {
          unsigned long i;
          int  *idata = (int *) (data + offset);
@@ -2541,7 +2541,7 @@ x_handle_dnd_message (struct frame *f, XClientMessageEvent *event,
     function expects them to be of size int (i.e. 32).  So to be able to
     use that function, put the data in the form it expects if format is 32. */
-  if (32 < BITS_PER_LONG && event->format == 32)
+  if (BITS_PER_LONG > 32 && event->format == 32)
    {
      for (i = 0; i < 5; ++i) /* There are only 5 longs in a ClientMessage. */
        idata[i] = event->data.l[i];
@@ -2571,7 +2571,7 @@ x_handle_dnd_message (struct frame *f, XClientMessageEvent *event,
  return 1;
 }
-DEFUN ("x-send-client-message", Fx_send_client_event,
+DEFUN ("x-send-client-message", Fx_send_client_message,
       Sx_send_client_message, 6, 6, 0,
       doc: /* Send a client message of MESSAGE-TYPE to window DEST on DISPLAY.
diff --git a/src/xsettings.c b/src/xsettings.c
index 576a5032eac..f48c49dbafe 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -673,19 +673,14 @@ apply_xft_settings (struct x_display_info *dpyinfo,
  if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi
      && settings->dpi > 0)
    {
-      Lisp_Object frame, tail;
      FcPatternDel (pat, FC_DPI);
      FcPatternAddDouble (pat, FC_DPI, settings->dpi);
      ++changed;
      oldsettings.dpi = settings->dpi;
-      /* Change the DPI on this display and all frames on the display.  */
+      /* Changing the DPI on this display affects all frames on it.
+         Check FRAME_RES_X and FRAME_RES_Y in frame.h to see how.  */
      dpyinfo->resy = dpyinfo->resx = settings->dpi;
-      FOR_EACH_FRAME (tail, frame)
-        if (FRAME_X_P (XFRAME (frame))
-            && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
-          XFRAME (frame)->resy = XFRAME (frame)->resx = settings->dpi;
    }
  if (changed)
diff --git a/src/xsmfns.c b/src/xsmfns.c
index cb7122202df..0af196d2160 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -221,7 +221,7 @@ smc_save_yourself_CB (SmcConn smcConn,
  props[props_idx]->name = xstrdup (SmRestartCommand);
  props[props_idx]->type = xstrdup (SmLISTofARRAY8);
  /* /path/to/emacs, --smid=xxx --no-splash --chdir=dir ... */
-  if (INT_MAX - 3 < initial_argc)
+  if (initial_argc > INT_MAX - 3)
    memory_full (SIZE_MAX);
  i = 3 + initial_argc;
  props[props_idx]->num_vals = i;
diff --git a/src/xterm.c b/src/xterm.c
index 73e9ad8374d..bd66d5c0def 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -133,6 +133,10 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
 #include "bitmaps/gray.xbm"
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
 /* Default to using XIM if available.  */
 #ifdef USE_XIM
 int use_xim = 1;
@@ -3227,7 +3231,11 @@ XTring_bell (struct frame *f)
      else
        {
          block_input ();
+#ifdef HAVE_XKB
+          XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
+#else
          XBell (FRAME_X_DISPLAY (f), 0);
+#endif
          XFlush (FRAME_X_DISPLAY (f));
          unblock_input ();
        }
@@ -5085,7 +5093,7 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild
    /* Draw the empty space above the handle.  Note that we can't clear
       zero-height areas; that means "clear to end of window."  */
-    if (0 < start)
+    if (start > 0)
      x_clear_area (FRAME_X_DISPLAY (f), w,
                    /* x, y, width, height, and exposures.  */
                    VERTICAL_SCROLL_BAR_LEFT_BORDER,