merge upstream

author: Joakim Verona 2013-09-10 23:52:26 +0200
committer: Joakim Verona 2013-09-10 23:52:26 +0200
commit: 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (patch)
tree: e5078c5545c777e21944a9ee4199a6f2c6d25ca9 /src
parent: 92aeabcc8a007f521a664e3aee092eb80ad0f49a (diff)
download: emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.tar.gz
emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.zip
61 files changed, 1360 insertions, 1394 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5d5a811b3c4..4e08178989e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,464 @@
+2013-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * eval.c (Feval): Document the new use of `lexical'.
+2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
+        Review and drop old frame resize hack.
+        * frame.h (struct frame): Remove force_flush_display_p.
+        * dispnew.c (update_frame): Adjust user and don't call
+        flush_frame here.  The comment has said that there was an issues
+        with redisplaying fringes, but I don't see any differences with
+        and without this hack.  Hopefully we can continue without it.
+        * xdisp.c (clear_garbaged_frames): Adjust user and do not clear
+        current frame matrices twice if resized_p is set.
+2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
+        Do not populate pure Xism x_sync to other ports.
+        * frame.h (x_sync): Move under HAVE_X_WINDOWS.
+        * frame.c (other_visible_frames) [HAVE_X_WINDOWS]: Use as such.
+        * nsfns.m, w32xfns.c (x_sync): Remove no-op.
+        * w32term.h (x_sync): Remove prototype.
+2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
+        Cleanup frame flushing.
+        * dispextern.h (struct redisplay_interface):
+        Drop flush_display_optional because flush_display is enough
+        for X and flushing via RIF is just a no-op for others.
+        * frame.h (flush_frame): New function.
+        * dispnew.c (update_frame):
+        * minibuf.c (read_minibuf):
+        * xdisp.c (echo_area_display, redisplay_preserve_echo_area):
+        Use it.
+        * keyboard.c (detect_input_pending_run_timers): Do not flush
+        all frames but selected one in redisplay_preserve_echo_area.
+        * nsterm.m (ns_flush): Remove no-op.
+        (ns_redisplay_interface): Adjust user.
+        * w32term.h (x_flush): Remove no-op.
+        (w32_redisplay_interface): Adjust user.
+        * xterm.c (x_flush): Simplify because we do not flush all
+        frames at once any more.  Adjust comment.
+        (x_redisplay_interface): Adjust user.
+2013-09-07  Paul Eggert  <eggert@cs.ucla.edu>
+        Port --without-x --enable-gcc-warnings to Fedora 19.
+        * gfilenotify.c (globals_of_gfilenotify):
+        Call g_type_init only if using an older glib version that needs it.
+2013-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
+        * lisp.h (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
+        (last_glyphless_glyph_merged_face_id): Remove declarations.
+        * dispextern.h (merge_glyphless_glyph_face): Add prototype.
+        * xdisp.c (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
+        (last_glyphless_glyph_merged_face_id): Now static.
+        (merge_escape_glyph_face): New function, refactored from...
+        (get_next_display_element): ...here.
+        (merge_glyphless_glyph_face): New function, refactored from...
+        (produce_glyphless_glyph): ...here...
+        * term.c (produce_glyphless_glyph): ...and here.
+2013-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * eval.c (eval_sub): Only call Ffunction if necessary.
+2013-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
+        Attempt to make redisplay more selective when changing cursor type.
+        * frame.h (struct frame): New bitfield cursor_type_changed.
+        * xdisp.c (cursor_type_changed): Remove.
+        (try_cursor_movement, redisplay_window, try_window_id)
+        (set_frame_cursor_types, try_window_reusing_current_matrix):
+        Adjust to use per-frame bitfield.
+        (redisplay_internal): Look for cursor type change on each visible
+        frame and consider all frames if cursor type has been changed on
+        the frame other than selected.  If cursor type has been changed on
+        selected frame only, do not use fast update.
+2013-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
+        Attempt to make redisplay more selective when changing fonts.
+        * frame.h (struct frame): New bitfield fonts_changed.
+        * dispextern.h (fonts_changed_p, adjust_glyphs): Remove declaration.
+        (adjust_frame_glyphs): Add prototype.
+        * dispnew.c (fonts_changed_p): Remove.
+        (adjust_glyphs): Remove because we do not
+        adjust matrices on all frames at once any more.
+        (adjust_frame_glyphs): Block and unblock input here.
+        (adjust_glyph_matrix): Use fonts_changed.
+        (change_frame_size_1): Use adjust_frame_glyphs.
+        * font.c (font_open_entity): Use fonts_changed.
+        * frame.c (set_menu_bar_lines, Fmake_terminal_frame):
+        * w32fns.c (x_set_menu_bar_lines, x_set_tool_bar_lines, Fx_show_tip):
+        * window.c (Fdelete_other_windows_internal, Fwindow_resize_apply)
+        (Fsplit_window_internal, Fdelete_window_internal, grow_mini_window)
+        (shrink_mini_window, Fresize_mini_window_internal)
+        (window_scroll_pixel_based, Fset_window_configuration)
+        (apply_window_adjustment, Fset_window_vscroll):
+        * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines, Fx_show_tip):
+        Use adjust_frame_glyphs.
+        * xdisp.c (redisplay_tool_bar, redisplay_window, try_window)
+        (try_window_reusing_current_matrix, try_window_id, display_line)
+        (IT_EXPAND_MATRIX_WIDTH): Use fonts_changed.
+        (redisplay_internal): Consider fonts_changed and adjust frame
+        matrices for each frame only if the frame is visible.  If font
+        has been changed on some frame during full redisplay, retry
+        only visible frames where the font has been actually changed.
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+        Cache current header and mode line height for each window.
+        * window.h (struct window): New fields mode_line_height
+        and header_line_height.
+        * window.c (make_window): Initialize them.
+        * dispextern.h (CURRENT_MODE_LINE_HEIGHT)
+        (CURRENT_HEADER_LINE_HEIGHT): Use them.  Adjust comment.
+        (current_mode_line_height, current_header_line_height):
+        Remove declaration.
+        * xdisp.c (current_mode_line_height, current_header_line_height):
+        Remove.
+        (pos_visible_p, init_xdisp): Adjust user.
+        (redisplay_window): Invalidate mode_line_height and
+        header_line_height if current and desired matrices do not agree.
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+        * fontset.c, window.c, xdisp.c (toplevel): Use TERM_HEADER.
+        * xfaces.c (toplevel) [HAVE_X_WINDOWS]: Do not include xterm.h twice.
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+        Make --without-x compatible with --enable-gcc-warnings.
+        * font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
+        * font.h (struct font_driver): Move draw, get_bitmap and free_bitmap
+        members under HAVE_WINDOW_SYSTEM.
+        * keyboard.c (make_lispy_focus_out): Likewise.
+        (record_menu_key): Move under HAVE_MENUS.
+        * xdisp.c (toplevel): Move hourglass_shown_p, hourglass_atimer and
+        THIN_SPACE_WIDTH under HAVE_WINDOW_SYSTEM.
+        (syms_of_xdisp): Adjust user.
+        (window_box_edges): Define only if HAVE_WINDOW_SYSTEM.
+        (start_hourglass, cancel_hourglass):
+        * xfaces.c (toplevel): Likewise with PT_PER_INCH,
+        clear_font_table_count, CLEAR_FONT_TABLE_COUNT
+        and CLEAR_FONT_TABLE_NFONTS.
+        (set_font_frame_param, clear_face_gcs, realize_non_ascii_face):
+        Declare only if HAVE_WINDOW_SYSTEM.
+        (lface_same_font_attributes_p, clear_face_gcs): Define only
+        if HAVE_WINDOW_SYSTEM.
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+        * frame.c (check_minibuf_window): Update 'frame' with frame pointer.
+        * xterm.c (x_scroll_bar_handle_click) [!USE_TOOLKIT_SCROLL_BARS]:
+        Don't pass C integer to XINT (tiny fix for 2013-09-03 change).
+2013-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.
+2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+        * alloc.c (make_event_array): First arg is now ptrdiff_t, not int.
+        This fixes a type error on hosts where ptrdiff_t is wider than int.
+2013-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * keyboard.c (read_key_sequence_vs): New function.
+        (Fread_key_sequence_vector, Fread_key_sequence): Use it to factor out
+        common code.
+        * callint.c (Fcall_interactively): Always return a vector for 'K'.
+2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+        Makefile improvements.
+        * Makefile.in (config.status): Don't use double-colon rules, as
+        they are not portable according to POSIX.  Fix shell typo with `;
+        I guess this rule has never been tested?
+        (VCSWITNESS): New macro, to override any environment var.
+2013-09-04  Dmitry Antipov  <dmantipov@yandex.ru>
+        * xterm.h (struct x_display_info): Do not track X connection
+        fd separately because it is always available from Display.
+        * xterm.c (x_term_init, x_delete_terminal, x_delete_display):
+        Adjust users.
+2013-09-03  Dmitry Antipov  <dmantipov@yandex.ru>
+        * buffer.c (drop_overlay):
+        * fileio.c (restore_point_unwind): Prefer unchain_marker to
+        Fset_marker (X, Qnil, ...) (which is the same but a bit slower).
+2013-09-03  Dmitry Antipov  <dmantipov@yandex.ru>
+        * buffer.c (Fmake_overlay, Fmove_overlay):
+        * intervals.c (set_point_from_marker):
+        * print.c (PRINTPREPARE): Prefer signal_error
+        to plain error and report unsuitable marker too.
+2013-09-03  Dmitry Antipov  <dmantipov@yandex.ru>
+        * xterm.h (struct scroll_bar): Prefer int to Lisp_Object
+        for 'dragging' member.
+        (struct x_output): Remove set-but-unused leftovers
+        'left_before_move' and 'top_before_move'.
+        * gtkutil.c (xg_set_toolkit_scroll_bar_thumb):
+        * xterm.c (xt_action_hook, xm_scroll_callback, xg_scroll_callback)
+        (xg_end_scroll_callback, xaw_jump_callback, xaw_scroll_callback)
+        (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
+        (x_scroll_bar_set_handle, XTset_vertical_scroll_bar)
+        (x_scroll_bar_handle_click, x_scroll_bar_note_movement)
+        (x_scroll_bar_report_motion, x_set_offset): Related users changed.
+        * xfns.c, image.c (XLIB_ILLEGAL_ACCESS): No longer needed.
+2013-09-03  Jan Djärv  <jan.h.d@swipnet.se>
+        * nsfont.m (INVALID_GLYPH): New define.
+        (nsfont_encode_char): Use INVALID_GLYPH.
+        (ns_uni_to_glyphs): Ditto, check for NSNullGlyph (Bug#15138).
+2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
+        * xterm.c (x_last_mouse_movement_time): Revert last change.
+        This code should use XDisplayMotionBufferSize to check display's
+        motion history first, and there are few other issues as well.
+        (x_scroll_bar_note_movement): Pass XMotionEvent rather than XEvent.
+        (handle_one_xevent): Adjust user.
+2013-09-02  Martin Rudalics  <rudalics@gmx.at>
+        * dispnew.c (Flast_nonminibuf_frame): Move from here ...
+        * frame.c (Flast_nonminibuf_frame): ... to here.
+        (check_minibuf_window): Don't abort if no window was found
+        (Bug#15247).
+2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
+        Use XGetMotionEvents to ask the last mouse motion time from X server.
+        * xterm.c (X_MOTION_HISTORY): Default to 1.
+        (x_last_mouse_movement_time) [X_MOTION_HISTORY]: New function.
+        (x_last_mouse_movement_time) [!X_MOTION_HISTORY]: Legacy version.
+        (note_mouse_movement, x_scroll_bar_note_movement) [!X_MOTION_HISTORY]:
+        Ifdef away legacy code.
+        (XTmouse_position, x_scroll_bar_report_motion):
+        Use x_last_mouse_movement_time.
+        (handle_one_xevent): Use event.xunmap and not event.xmap when handling
+        UnmapNotify event.
+2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
+        * msdos.c (last_mouse_window): Move to...
+        (dos_rawgetc): ...this function and adjust comment.
+        * nsterm.m (last_window): Rename to last_mouse_window, move to...
+        (mouseMoved): ...this function and adjust comment.
+        * w32term.c (last_window): Likewise with...
+        (w32_read_socket): ...this function.
+        * xterm.c (last_window): Likewise with...
+        (handle_one_xevent): ...this function.
+2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
+        * window.h (Vmouse_window, Vmouse_event): Remove the leftovers.
+        * xterm.c (toplevel): Drop obsolete comment and move compose_status...
+        (handle_one_xevent): ...to here.
+        (STORE_KEYSYM_FOR_DEBUG): Move under ENABLE_CHECKING and make no-op
+        otherwise.
+2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
+        * msdos.c (IT_set_terminal_window): Remove no-op.
+        (initialize_msdos_display): Adjust terminal setup.
+        * w32console.c (w32con_set_terminal_window): Remove no-op.
+        (initialize_w32_display): Adjust terminal setup.
+        * w32term.c (w32_set_terminal_window): Remove no-op.
+        (w32_create_terminal): Adjust terminal setup.
+        * xterm.c (XTset_terminal_window): Remove no-op.
+        (x_create_terminal): Adjust terminal setup.
+2013-09-01  Dmitry Antipov  <dmantipov@yandex.ru>
+        * nsterm.m (ns_set_terminal_modes, ns_reset_terminal_modes):
+        Remove no-ops.
+        (ns_create_terminal): Adjust terminal setup.
+        * w32term.c (w32_set_terminal_modes, w32_reset_terminal_modes):
+        Remove no-ops.
+        (w32_create_terminal): Adjust terminal setup.
+        * xterm.c (XTset_terminal_modes, XTreset_terminal_modes):
+        Remove no-ops.
+        (x_create_terminal): Adjust terminal setup.
+2013-09-01  Dmitry Antipov  <dmantipov@yandex.ru>
+        * dispextern.h (SET_TEXT_POS_FROM_MARKER): Indent.
+        (CLIP_TEXT_POS_FROM_MARKER): New macro.
+        * dispnew.c (buffer_posn_from_coords):
+        * window.c (Fwindow_end, displayed_window_lines):
+        * xdisp.c (redisplay_mode_lines): Use it.
+2013-09-01  Jan Djärv  <jan.h.d@swipnet.se>
+        * fontset.c (face_for_char): Check char in the current face font first
+        if HAVE_NS (Bug#15138).
+2013-08-31  Martin Rudalics  <rudalics@gmx.at>
+        * window.c (temp_output_buffer_show): Make sure window returned
+        by display_buffer is live (Bug#15213).
+2013-08-30  Dmitry Antipov  <dmantipov@yandex.ru>
+        Minor cleanup to avoid forward declarations.
+        * coding.h (struct ccl_spec): Remove forward declaration.
+        * composite.h (toplevel): Include font.h.
+        (struct composition_it, struct face, struct font_metrics):
+        Remove forward declaration.
+        * dispextern.h (struct image, struct atimer): Likewise.
+        * emacsgtkfixed.h (struct frame): Likewise.
+        * emacsgtkfixed.c (toplevel): Reorder headers and drop stdio.h.
+        * font.h (struct font_driver, struct font, struct glyph_string)
+        (struct face): Remove forward declaration.
+        * fontset.h (struct face, struct font): Likewise.
+        * frame.h (toplevel): Style cleanup.
+        (enum output_method): Move to...
+        * termhooks.h (enum output_method): ...here.
+        (struct glyph, struct frame, struct ns_display_info)
+        (struct x_display_info, struct w32_display_info):
+        Remove forward declaration.
+        * xterm.h (toplevel): Include termhooks.h.
+        (struct font, struct window, struct glyph_matrix, struct frame)
+        (struct input_event, struct face, struct image): Remove forward
+        declaration.
+        * gtkutil.h (struct _widget_value): Likewise.
+        * keyboard.h (toplevel): Include termhooks.h.
+        (struct input_event): Remove forward declaration.
+2013-08-29  Dmitry Antipov  <dmantipov@yandex.ru>
+        * intervals.c (set_point_from_marker): New function.
+        * editfns.c (Fgoto_char):
+        * process.c (Finternal_default_process_filter):
+        * window.c (select_window_1): Use it.
+        * buffer.h (set_point_from_marker): Add prototype.
+2013-08-29  Eli Zaretskii  <eliz@gnu.org>
+        * w32.c (term_winsock): Call release_listen_threads before calling
+        WSACleanup.
+        (_sys_wait_accept): Wait for accept event in a loop with a finite
+        timeout, instead of waiting indefinitely.  Will hopefully avoid
+        hanging during exit because WSACleanup deadlocks waiting for the
+        event object to be released.  (Bug#14333)
+        * w32proc.c (release_listen_threads): New function, signals all
+        the reader threads that listen for connections to stop waiting.
+        * w32.h (release_listen_threads): Add prototype.
+2013-08-29  Dmitry Antipov  <dmantipov@yandex.ru>
+        * alloc.c (Fmake_marker, build_marker): Zero need_adjustment
+        field of new marker (for sanity and safety).
+        * lisp.h (XSETMARKER): Remove unused macro (it doesn't work
+        anyway because XMISCTYPE is a function and can't be an lvalue).
+2013-08-29  Dmitry Antipov  <dmantipov@yandex.ru>
+        * xterm.c (x_clear_area): Lost 7th arg because it is always False.
+        (x_after_update_window_line, x_scroll_bar_create):
+        (x_scroll_bar_set_handle, XTset_vertical_scroll_bar):
+        (handle_one_xevent, x_clear_frame_area):
+        * gtkutil.c (xg_clear_under_internal_border, xg_update_scrollbar_pos):
+        * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): Adjust users.
+        * xterm.h (x_clear_area): Adjust prototype.
+2013-08-29  Dmitry Antipov  <dmantipov@yandex.ru>
+        Hook scanning and indentation functions to find_newline.  This helps
+        to avoid duplicated code and renders more respect to newline cache.
+        * lisp.h (scan_newline): Prefer ptrdiff_t to EMACS_INT.
+        * cmds.c (Fforward_line):
+        * indent.c (scan_for_column, Fcurrent_indentation, indented_beyond_p):
+        Use find_newline and avoid unnecessary point movements.
+        * search.c (scan_newline): Implement on top of find_newline.
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * eval.c (Ffuncall): Fix handling of ((lambda ..) ..) in lexically
+        scoped code (bug#11258).
+2013-08-28  Davor Cubranic  <cubranic@stat.ubc.ca> (tiny change)
+        * nsterm.m (last_window): New variable.
+        (EV_TRAILER2): New macro.
+        (EV_TRAILER): Call EV_TRAILER2.
+        (mouseMoved:):  Add support for mouse-autoselect-window
+        on nextstep (Bug#6888).
+2013-08-28  Andreas Schwab  <schwab@suse.de>
+        * regex.c (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE, CHAR_HEAD_P)
+        (SINGLE_BYTE_CHAR_P, SAME_CHARSET_P, MAKE_CHAR, BYTE8_TO_CHAR):
+        Remove unused macro definitions.
+        (CHARSET_RANGE_TABLE_BITS, EXTEND_RANGE_TABLE)
+        (SET_RANGE_TABLE_WORK_AREA_BIT, SET_RANGE_TABLE_WORK_AREA):
+        Only define if emacs.
+2013-08-28  Dmitry Antipov  <dmantipov@yandex.ru>
+        Prefer enum glyph_row_area to int where appropriate.
+        * dispextern.h (enum glyph_row_area): Add ANY_AREA member.
+        Fix comment.
+        (window_box, window_box_width, window_box_left, window_box_left_offset)
+        (window_box_right, window_box_right_offset): Adjust prototypes.
+        * xdisp.c (window_box, window_box_width, window_box_left)
+        (window_box_left_offset, window_box_right, window_box_right_offset):
+        Use enum glyph_row_area.  Adjust users and tweak comment where needed.
+        (window_box_edges): Likewise.  Lost 2nd arg since it is always ANY_AREA.
+        * nsterm.m (ns_clip_to_row):
+        * w32term.c (w32_clip_to_row):
+        * xterm.c (x_clip_to_row): Likewise.
+2013-08-28  Dmitry Antipov  <dmantipov@yandex.ru>
+        * buffer.c (Foverlays_at, Foverlays_in, Fnext_overlay_change)
+        (Fprevious_overlay_change): Fast path for buffer with no overlays.
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+2013-08-28  Dmitry Antipov  <dmantipov@yandex.ru>
+        Redesign redisplay interface to drop global output_cursor.
+        * dispextern.h (struct redisplay_interface): Remove cursor_to member.
+        (toplevel): Remove declaration of output_cursor.
+        (set_output_cursor, x_cursor_to): Remove prototype.
+        * window.h (struct window): New member output_cursor.
+        (output_cursor_to): New function to replace RIF member.
+        * dispnew.c (redraw_overlapped_rows, update_marginal_area)
+        (update_text_area, set_window_cursor_after_update): Use it.
+        * xdisp.c (output_cursor, set_output_cursor, x_cursor_to): Remove.
+        (x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
+        * nsterm.m (ns_update_window_begin, ns_update_window_end):
+        * w32term.c (x_update_window_begin, x_update_window_end):
+        * xterm.c (x_update_window_begin, x_update_window_end):
+        Adjust to use per-window output cursor.
 2013-08-27  Paul Eggert  <eggert@cs.ucla.edu>
+        Simplify SELECT_TYPE-related code.
+        Like EMACS_TIME, this portability layer is no longer needed, since
+        Emacs has been using fd_set as a portability layer for some time.
+        * sysselect.h (FD_SETSIZE): Rename from MAXDESC.  All uses changed.
+        (SELECT_TYPE): Remove.  All uses changed to fd_set.
+        (fd_set) [!FD_SET]: New typedef.
        Simplify EMACS_TIME-related code.
        This portability layer is no longer needed, since Emacs has been
        using struct timespec as a portability layer for some time.
diff --git a/src/Makefile.in b/src/Makefile.in
index 76a4e0c5703..aa51108ffc2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,7 +23,7 @@
 # script may need modifying in sync with changes made here.  Try to
 # avoid shell-ism because the DOS build has to use the DOS shell.
-SHELL = /bin/sh
+SHELL = @SHELL@
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
@@ -548,14 +548,9 @@ stamp-oldxmenu: $(OLDXMENU_DEPS)
 $(OLDXMENU): $(OLDXMENU_TARGET)
-../config.status:: epaths.in
+../config.status: config.in epaths.in
-        @echo "The file epaths.h needs to be set up from epaths.in."
+        @echo "The file ${?:.in=.h} needs to be set up from $?."
-        @echo "Please run the `configure' script again."
+        @echo "Please run the 'configure' script again."
-        exit 1
-../config.status:: config.in
-        @echo "The file config.h needs to be set up from config.in."
-        @echo "Please run the `configure' script again."
        exit 1
 doc.o: buildobj.h
@@ -668,6 +663,9 @@ $(lisp): $(BOOTSTRAPEMACS)
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.
+## If empty it is ignored; the parent makefile can set it to some other value.
+VCSWITNESS =
 $(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
        cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$(bootstrap_exe)
diff --git a/src/alloc.c b/src/alloc.c
index ebb8ef58991..0989e63664f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3479,6 +3479,7 @@ DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
  p->charpos = 0;
  p->next = NULL;
  p->insertion_type = 0;
+  p->need_adjustment = 0;
  return val;
 }
@@ -3503,6 +3504,7 @@ build_marker (struct buffer *buf, ptrdiff_t charpos, ptrdiff_t bytepos)
  m->charpos = charpos;
  m->bytepos = bytepos;
  m->insertion_type = 0;
+  m->need_adjustment = 0;
  m->next = BUF_MARKERS (buf);
  BUF_MARKERS (buf) = m;
  return obj;
@@ -3525,9 +3527,9 @@ free_marker (Lisp_Object marker)
   Any number of arguments, even zero arguments, are allowed.  */
 Lisp_Object
-make_event_array (register int nargs, Lisp_Object *args)
+make_event_array (ptrdiff_t nargs, Lisp_Object *args)
 {
-  int i;
+  ptrdiff_t i;
  for (i = 0; i < nargs; i++)
    /* The things that fit in a string
diff --git a/src/buffer.c b/src/buffer.c
index e42dbb2befd..ff05da6d0d9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -892,8 +892,8 @@ drop_overlay (struct buffer *b, struct Lisp_Overlay *ov)
  eassert (b == XBUFFER (Fmarker_buffer (ov->start)));
  modify_overlay (b, marker_position (ov->start),
                  marker_position (ov->end));
-  Fset_marker (ov->start, Qnil, Qnil);
+  unchain_marker (XMARKER (ov->start));
-  Fset_marker (ov->end, Qnil, Qnil);
+  unchain_marker (XMARKER (ov->end));
 }
@@ -3843,7 +3843,8 @@ for the front of the overlay advance when text is inserted there
 The fifth arg REAR-ADVANCE, if non-nil, makes the marker
 for the rear of the overlay advance when text is inserted there
 \(which means the text *is* included in the overlay).  */)
-  (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, Lisp_Object front_advance, Lisp_Object rear_advance)
+  (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer,
+   Lisp_Object front_advance, Lisp_Object rear_advance)
 {
  Lisp_Object overlay;
  struct buffer *b;
@@ -3852,12 +3853,11 @@ for the rear of the overlay advance when text is inserted there
    XSETBUFFER (buffer, current_buffer);
  else
    CHECK_BUFFER (buffer);
-  if (MARKERP (beg)
-      && ! EQ (Fmarker_buffer (beg), buffer))
+  if (MARKERP (beg) && !EQ (Fmarker_buffer (beg), buffer))
-    error ("Marker points into wrong buffer");
+    signal_error ("Marker points into wrong buffer", beg);
-  if (MARKERP (end)
+  if (MARKERP (end) && !EQ (Fmarker_buffer (end), buffer))
-      && ! EQ (Fmarker_buffer (end), buffer))
+    signal_error ("Marker points into wrong buffer", end);
-    error ("Marker points into wrong buffer");
  CHECK_NUMBER_COERCE_MARKER (beg);
  CHECK_NUMBER_COERCE_MARKER (end);
@@ -3983,12 +3983,10 @@ buffer.  */)
  if (NILP (Fbuffer_live_p (buffer)))
    error ("Attempt to move overlay to a dead buffer");
-  if (MARKERP (beg)
+  if (MARKERP (beg) && !EQ (Fmarker_buffer (beg), buffer))
-      && ! EQ (Fmarker_buffer (beg), buffer))
+    signal_error ("Marker points into wrong buffer", beg);
-    error ("Marker points into wrong buffer");
+  if (MARKERP (end) && !EQ (Fmarker_buffer (end), buffer))
-  if (MARKERP (end)
+    signal_error ("Marker points into wrong buffer", end);
-      && ! EQ (Fmarker_buffer (end), buffer))
-    error ("Marker points into wrong buffer");
  CHECK_NUMBER_COERCE_MARKER (beg);
  CHECK_NUMBER_COERCE_MARKER (end);
@@ -4170,6 +4168,9 @@ DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
  CHECK_NUMBER_COERCE_MARKER (pos);
+  if (!buffer_has_overlays ())
+    return Qnil;
  len = 10;
  /* We can't use alloca here because overlays_at can call xrealloc.  */
  overlay_vec = xmalloc (len * sizeof *overlay_vec);
@@ -4202,6 +4203,9 @@ end of the buffer.  */)
  CHECK_NUMBER_COERCE_MARKER (beg);
  CHECK_NUMBER_COERCE_MARKER (end);
+  if (!buffer_has_overlays ())
+    return Qnil;
  len = 10;
  overlay_vec = xmalloc (len * sizeof *overlay_vec);
@@ -4230,6 +4234,9 @@ the value is (point-max).  */)
  CHECK_NUMBER_COERCE_MARKER (pos);
+  if (!buffer_has_overlays ())
+    return make_number (ZV);
  len = 10;
  overlay_vec = xmalloc (len * sizeof *overlay_vec);
@@ -4269,6 +4276,9 @@ the value is (point-min).  */)
  CHECK_NUMBER_COERCE_MARKER (pos);
+  if (!buffer_has_overlays ())
+    return make_number (BEGV);
  /* At beginning of buffer, we know the answer;
     avoid bug subtracting 1 below.  */
  if (XINT (pos) == BEGV)
diff --git a/src/buffer.h b/src/buffer.h
index bedb7890939..169a15c7d0f 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -249,6 +249,7 @@ extern void temp_set_point (struct buffer *, ptrdiff_t);
 extern void set_point_both (ptrdiff_t, ptrdiff_t);
 extern void temp_set_point_both (struct buffer *,
                                 ptrdiff_t, ptrdiff_t);
+extern void set_point_from_marker (Lisp_Object);
 extern void enlarge_buffer_text (struct buffer *, ptrdiff_t);
diff --git a/src/callint.c b/src/callint.c
index 25096af5068..d31604b070e 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -616,8 +616,8 @@ invoke it.  If KEYS is omitted or nil, the return value of
            Fput_text_property (make_number (0),
                                make_number (SCHARS (callint_message)),
                                Qface, Qminibuffer_prompt, callint_message);
-            args[i] = Fread_key_sequence (callint_message,
+            args[i] = Fread_key_sequence_vector (callint_message,
-                                          Qnil, Qt, Qnil, Qnil);
+                                                 Qnil, Qt, Qnil, Qnil);
            teml = args[i];
            visargs[i] = Fkey_description (teml, Qnil);
            unbind_to (speccount1, Qnil);
diff --git a/src/cmds.c b/src/cmds.c
index ce91877f85e..aeedb152f62 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -121,9 +121,7 @@ With positive N, a non-empty line at the end counts as one line
 successfully moved (for the return value).  */)
  (Lisp_Object n)
 {
-  ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
+  ptrdiff_t opoint = PT, pos, pos_byte, shortage, count;
-  ptrdiff_t pos, pos_byte;
-  EMACS_INT count, shortage;
  if (NILP (n))
    count = 1;
@@ -134,16 +132,12 @@ successfully moved (for the return value).  */)
    }
  if (count <= 0)
-    shortage = scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, count - 1, 1);
+    pos = find_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, count - 1,
+                        &shortage, &pos_byte, 1);
  else
-    shortage = scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, count, 1);
+    pos = find_newline (PT, PT_BYTE, ZV, ZV_BYTE, count,
+                        &shortage, &pos_byte, 1);
-  /* Since scan_newline does TEMP_SET_PT_BOTH,
-     and we want to set PT "for real",
-     go back to the old point and then come back here.  */
-  pos = PT;
-  pos_byte = PT_BYTE;
-  TEMP_SET_PT_BOTH (opoint, opoint_byte);
  SET_PT_BOTH (pos, pos_byte);
  if (shortage > 0
@@ -310,7 +304,7 @@ At the end, it runs `post-self-insert-hook'.  */)
  /* Barf if the key that invoked this was not a character.  */
  if (!CHARACTERP (last_command_event))
    bitch_at_user ();
-  {
+  else {
    int character = translate_char (Vtranslation_table_for_input,
                                    XINT (last_command_event));
    int val = internal_self_insert (character, XFASTINT (n));
diff --git a/src/coding.h b/src/coding.h
index 7b7078e06fa..2c01a05d197 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -378,8 +378,6 @@ struct emacs_mule_spec
  struct composition_status cmp_status;
 };
-struct ccl_spec;
 struct undecided_spec
 {
  /* Inhibit null byte detection.  1 means always inhibit,
diff --git a/src/composite.h b/src/composite.h
index 53665b36bd1..df170093797 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -25,6 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_COMPOSITE_H
 #define EMACS_COMPOSITE_H
+#include "font.h"
 INLINE_HEADER_BEGIN
 #ifndef COMPOSITE_INLINE
 # define COMPOSITE_INLINE INLINE
@@ -312,10 +314,6 @@ enum lglyph_indices
 #define LGLYPH_WADJUST(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \
                           ? XINT (AREF (LGLYPH_ADJUSTMENT (g), 2)) : 0)
-struct composition_it;
-struct face;
-struct font_metrics;
 extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t);
 extern Lisp_Object composition_gstring_from_id (ptrdiff_t);
 extern bool composition_gstring_p (Lisp_Object);
diff --git a/src/dispextern.h b/src/dispextern.h
index c32577c41dc..e9f57d9fa22 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -223,8 +223,16 @@ struct text_pos
 /* Set text position POS from marker MARKER.  */
 #define SET_TEXT_POS_FROM_MARKER(POS, MARKER)           \
-     (CHARPOS (POS) = marker_position ((MARKER)),       \
+  (CHARPOS (POS) = marker_position (MARKER),            \
-      BYTEPOS (POS) = marker_byte_position ((MARKER)))
+   BYTEPOS (POS) = marker_byte_position (MARKER))
+/* Like above, but clip POS within accessible range.  */
+#define CLIP_TEXT_POS_FROM_MARKER(POS, MARKER)          \
+  (CHARPOS (POS) = clip_to_bounds                       \
+   (BEGV, marker_position (MARKER), ZV),                \
+   BYTEPOS (POS) = clip_to_bounds                       \
+   (BEGV_BYTE, marker_byte_position (MARKER), ZV_BYTE))
 /* Set marker MARKER from text position POS.  */
@@ -758,11 +766,12 @@ void check_matrix_pointer_lossage (struct glyph_matrix *);
                             Glyph Rows
 ***********************************************************************/
-/* Area in window glyph matrix.  If values are added or removed, the
+/* Area in window glyph matrix.  If values are added or removed,
-   function mark_object in alloc.c has to be changed.  */
+   the function mark_glyph_matrix in alloc.c may need to be changed.  */
 enum glyph_row_area
 {
+  ANY_AREA = -1,
  LEFT_MARGIN_AREA,
  TEXT_AREA,
  RIGHT_MARGIN_AREA,
@@ -1193,12 +1202,6 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
      ((ROW)->phys_height - (ROW)->phys_ascent  \
       > (ROW)->height - (ROW)->ascent)
-/* True means that fonts have been loaded since the last glyph
-   matrix adjustments.  The function redisplay_internal adjusts glyph
-   matrices when this flag is true.  */
-extern bool fonts_changed_p;
 /* A glyph for a space.  */
 extern struct glyph space_glyph;
@@ -1429,31 +1432,31 @@ struct glyph_string
 #define CURRENT_MODE_LINE_FACE_ID(W)            \
        (CURRENT_MODE_LINE_FACE_ID_3((W), XWINDOW (selected_window), (W)))
-/* Return the current height of the mode line of window W.  If not
+/* Return the current height of the mode line of window W.  If not known
-   known from current_mode_line_height, look at W's current glyph
+   from W->mode_line_height, look at W's current glyph matrix, or return
-   matrix, or return a default based on the height of the font of the
+   a default based on the height of the font of the face `mode-line'.  */
-   face `mode-line'.  */
-#define CURRENT_MODE_LINE_HEIGHT(W)                             \
+#define CURRENT_MODE_LINE_HEIGHT(W)                                     \
-     (current_mode_line_height >= 0                             \
+  (W->mode_line_height >= 0                                             \
-      ? current_mode_line_height                                \
+   ? W->mode_line_height                                                \
-      : (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)          \
+   : (W->mode_line_height                                               \
-         ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)        \
+      = (MATRIX_MODE_LINE_HEIGHT (W->current_matrix)                    \
-         : estimate_mode_line_height (XFRAME ((W)->frame),      \
+         ? MATRIX_MODE_LINE_HEIGHT (W->current_matrix)                  \
-                                      CURRENT_MODE_LINE_FACE_ID (W))))
+         : estimate_mode_line_height                                    \
+             (XFRAME (W->frame), CURRENT_MODE_LINE_FACE_ID (W)))))
-/* Return the current height of the header line of window W.  If not
+/* Return the current height of the header line of window W.  If not known
-   known from current_header_line_height, look at W's current glyph
+   from W->header_line_height, look at W's current glyph matrix, or return
-   matrix, or return an estimation based on the height of the font of
+   an estimation based on the height of the font of the face `header-line'.  */
-   the face `header-line'.  */
 #define CURRENT_HEADER_LINE_HEIGHT(W)                           \
-      (current_header_line_height >= 0                          \
+  (W->header_line_height >= 0                                   \
-       ? current_header_line_height                             \
+   ? W->header_line_height                                      \
-       : (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)       \
+   : (W->header_line_height                                     \
-          ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)     \
+      = (MATRIX_HEADER_LINE_HEIGHT (W->current_matrix)          \
-          : estimate_mode_line_height (XFRAME ((W)->frame),     \
+         ? MATRIX_HEADER_LINE_HEIGHT (W->current_matrix)        \
-                                       HEADER_LINE_FACE_ID)))
+         : estimate_mode_line_height                            \
+             (XFRAME (W->frame), HEADER_LINE_FACE_ID))))
 /* Return the height of the desired mode line of window W.  */
@@ -2818,19 +2821,9 @@ struct redisplay_interface
  void (*update_window_end_hook) (struct window *w, bool cursor_on_p,
                                  bool mouse_face_overwritten_p);
-  /* Move cursor to row/column position VPOS/HPOS, pixel coordinates
-     Y/X. HPOS/VPOS are window-relative row and column numbers and X/Y
-     are window-relative pixel positions.  */
-  void (*cursor_to) (struct window *w, int vpos, int hpos, int y, int x);
  /* Flush the display of frame F.  For X, this is XFlush.  */
  void (*flush_display) (struct frame *f);
-  /* Flush the display of frame F if non-NULL.  This is called
-     during redisplay, and should be NULL on systems which flush
-     automatically before reading input.  */
-  void (*flush_display_optional) (struct frame *f);
  /* Clear the mouse highlight in window W, if there is any.  */
  void (*clear_window_mouse_face) (struct window *w);
@@ -2901,11 +2894,6 @@ struct redisplay_interface
 #ifdef HAVE_WINDOW_SYSTEM
-/* Structure forward declarations.  */
-struct image;
 /* Each image format (JPEG, TIFF, ...) supported is described by
   a structure of the type below.  */
@@ -3196,14 +3184,15 @@ int resize_mini_window (struct window *, int);
 void set_vertical_scroll_bar (struct window *);
 #endif
 int try_window (Lisp_Object, struct text_pos, int);
-void window_box (struct window *, int, int *, int *, int *, int *);
+void window_box (struct window *, enum glyph_row_area,
+                 int *, int *, int *, int *);
 int window_box_height (struct window *);
 int window_text_bottom_y (struct window *);
-int window_box_width (struct window *, int);
+int window_box_width (struct window *, enum glyph_row_area);
-int window_box_left (struct window *, int);
+int window_box_left (struct window *, enum glyph_row_area);
-int window_box_left_offset (struct window *, int);
+int window_box_left_offset (struct window *, enum glyph_row_area);
-int window_box_right (struct window *, int);
+int window_box_right (struct window *, enum glyph_row_area);
-int window_box_right_offset (struct window *, int);
+int window_box_right_offset (struct window *, enum glyph_row_area);
 int estimate_mode_line_height (struct frame *, enum face_id);
 void pixel_to_glyph_coords (struct frame *, int, int, int *, int *,
                            NativeRectangle *, int);
@@ -3229,7 +3218,6 @@ int frame_mode_line_height (struct frame *);
 extern Lisp_Object Qtool_bar;
 extern bool redisplaying_p;
 extern int help_echo_showing_p;
-extern int current_mode_line_height, current_header_line_height;
 extern Lisp_Object help_echo_string, help_echo_window;
 extern Lisp_Object help_echo_object, previous_help_echo_string;
 extern ptrdiff_t help_echo_pos;
@@ -3243,6 +3231,7 @@ extern ptrdiff_t compute_display_string_pos (struct text_pos *,
 extern ptrdiff_t compute_display_string_end (ptrdiff_t,
                                             struct bidi_string_data *);
 extern void produce_stretch_glyph (struct it *);
+extern int merge_glyphless_glyph_face (struct it *);
 #ifdef HAVE_WINDOW_SYSTEM
@@ -3260,9 +3249,6 @@ extern void x_insert_glyphs (struct window *, struct glyph_row *,
                             struct glyph *, enum glyph_row_area, int);
 extern void x_clear_end_of_line (struct window *, struct glyph_row *,
                                 enum glyph_row_area, int);
-extern struct cursor_pos output_cursor;
 extern void x_fix_overlapping_area (struct window *, struct glyph_row *,
                                    enum glyph_row_area, int);
 extern void draw_phys_cursor_glyph (struct window *,
@@ -3272,10 +3258,6 @@ extern void get_phys_cursor_geometry (struct window *, struct glyph_row *,
                                      struct glyph *, int *, int *, int *);
 extern void erase_phys_cursor (struct window *);
 extern void display_and_set_cursor (struct window *, bool, int, int, int, int);
-extern void set_output_cursor (struct cursor_pos *);
-extern void x_cursor_to (struct window *, int, int, int, int);
 extern void x_update_cursor (struct frame *, bool);
 extern void x_clear_cursor (struct window *);
 extern void x_draw_vertical_border (struct window *w);
@@ -3439,8 +3421,6 @@ extern frame_parm_handler x_frame_parm_handlers[];
 extern void start_hourglass (void);
 extern void cancel_hourglass (void);
 extern int hourglass_shown_p;
-struct atimer;                  /* Defined in atimer.h.  */
 /* If non-null, an asynchronous timer that, when it expires, displays
   an hourglass cursor on all frames.  */
 extern struct atimer *hourglass_atimer;
@@ -3492,7 +3472,7 @@ extern void cancel_line (int, struct frame *);
 extern void init_desired_glyphs (struct frame *);
 extern bool update_frame (struct frame *, bool, bool);
 extern void bitch_at_user (void);
-void adjust_glyphs (struct frame *);
+extern void adjust_frame_glyphs (struct frame *);
 void free_glyphs (struct frame *);
 void free_window_matrices (struct window *);
 void check_glyph_memory (void);
diff --git a/src/dispnew.c b/src/dispnew.c
index 096416db56e..c239d7ab745 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -80,7 +80,6 @@ struct dim
 static void update_frame_line (struct frame *, int);
 static int required_matrix_height (struct window *);
 static int required_matrix_width (struct window *);
-static void adjust_frame_glyphs (struct frame *);
 static void change_frame_size_1 (struct frame *, int, int, bool, bool, bool);
 static void increment_row_positions (struct glyph_row *, ptrdiff_t, ptrdiff_t);
 static void fill_up_frame_row_with_spaces (struct glyph_row *, int);
@@ -155,16 +154,6 @@ static int glyph_pool_count;
 static struct frame *frame_matrix_frame;
-/* True means that fonts have been loaded since the last glyph
-   matrix adjustments.  Redisplay must stop, and glyph matrices must
-   be adjusted when this flag becomes true during display.  The
-   reason fonts can be loaded so late is that fonts of fontsets are
-   loaded on demand.  Another reason is that a line contains many
-   characters displayed by zero width or very narrow glyphs of
-   variable-width fonts.  */
-bool fonts_changed_p;
 /* Convert vpos and hpos from frame to window and vice versa.
   This may only be used for terminal frames.  */
@@ -415,7 +404,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
     Get W's size.  */
  if (w)
    {
-      window_box (w, -1, 0, 0, &window_width, &window_height);
+      window_box (w, ANY_AREA, 0, 0, &window_width, &window_height);
      header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
      header_line_changed_p = header_line_p != matrix->header_line_p;
@@ -435,7 +424,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
                                  || right != matrix->right_margin_glyphs);
      if (!marginal_areas_changed_p
-          && !fonts_changed_p
+          && !XFRAME (w->frame)->fonts_changed
          && !header_line_changed_p
          && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w)
          && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w)
@@ -1801,37 +1790,17 @@ allocate_matrices_for_window_redisplay (struct window *w)
    }
 }
+/* Allocate/reallocate glyph matrices of a single frame F.
-/* Re-allocate/ re-compute glyph matrices on frame F.  If F is null,
+   This function must be called when a new frame is created,
-   do it for all frames; otherwise do it just for the given frame.
+   its size changes, or its window configuration changes.  */
-   This function must be called when a new frame is created, its size
-   changes, or its window configuration changes.  */
 void
-adjust_glyphs (struct frame *f)
+adjust_frame_glyphs (struct frame *f)
 {
  /* Block input so that expose events and other events that access
     glyph matrices are not processed while we are changing them.  */
  block_input ();
-  if (f)
-    adjust_frame_glyphs (f);
-  else
-    {
-      Lisp_Object tail, lisp_frame;
-      FOR_EACH_FRAME (tail, lisp_frame)
-        adjust_frame_glyphs (XFRAME (lisp_frame));
-    }
-  unblock_input ();
-}
-/* Allocate/reallocate glyph matrices of a single frame F.  */
-static void
-adjust_frame_glyphs (struct frame *f)
-{
  if (FRAME_WINDOW_P (f))
    adjust_frame_glyphs_for_window_redisplay (f);
  else
@@ -1841,6 +1810,8 @@ adjust_frame_glyphs (struct frame *f)
  adjust_decode_mode_spec_buffer (f);
  f->glyphs_initialized_p = 1;
+  unblock_input ();
 }
 /* Return true if any window in the tree has nonzero window margins.  See
@@ -3092,16 +3063,6 @@ update_frame (struct frame *f, bool force_p, bool inhibit_hairy_id_p)
      /* Update windows.  */
      paused_p = update_window_tree (root_window, force_p);
      update_end (f);
-      /* This flush is a performance bottleneck under X,
-         and it doesn't seem to be necessary anyway (in general).
-         It is necessary when resizing the window with the mouse, or
-         at least the fringes are not redrawn in a timely manner.  ++kfs */
-      if (f->force_flush_display_p)
-        {
-          FRAME_RIF (f)->flush_display (f);
-          f->force_flush_display_p = 0;
-        }
    }
  else
    {
@@ -3225,8 +3186,8 @@ redraw_overlapped_rows (struct window *w, int yb)
          for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
            {
-              FRAME_RIF (f)->cursor_to (w, i, 0, row->y,
+              output_cursor_to (w, i, 0, row->y,
-                                        area == TEXT_AREA ? row->x : 0);
+                                area == TEXT_AREA ? row->x : 0);
              if (row->used[area])
                FRAME_RIF (f)->write_glyphs (w, row, row->glyphs[area],
                                             area, row->used[area]);
@@ -3483,7 +3444,7 @@ update_window (struct window *w, bool force_p)
      /* End the update of window W.  Don't set the cursor if we
         paused updating the display because in this case,
         set_window_cursor_after_update hasn't been called, and
-         output_cursor doesn't contain the cursor location.  */
+         W->output_cursor doesn't contain the cursor location.  */
      rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p);
    }
  else
@@ -3516,7 +3477,7 @@ update_marginal_area (struct window *w, struct glyph_row *updated_row,
  /* Set cursor to start of glyphs, write them, and clear to the end
     of the area.  I don't think that something more sophisticated is
     necessary here, since marginal areas will not be the default.  */
-  rif->cursor_to (w, vpos, 0, desired_row->y, 0);
+  output_cursor_to (w, vpos, 0, desired_row->y, 0);
  if (desired_row->used[area])
    rif->write_glyphs (w, updated_row, desired_row->glyphs[area],
                       area, desired_row->used[area]);
@@ -3554,7 +3515,7 @@ update_text_area (struct window *w, struct glyph_row *updated_row, int vpos)
          && !(current_row->mode_line_p && vpos > 0))
      || current_row->x != desired_row->x)
    {
-      rif->cursor_to (w, vpos, 0, desired_row->y, desired_row->x);
+      output_cursor_to (w, vpos, 0, desired_row->y, desired_row->x);
      if (desired_row->used[TEXT_AREA])
        rif->write_glyphs (w, updated_row, desired_row->glyphs[TEXT_AREA],
@@ -3697,7 +3658,7 @@ update_text_area (struct window *w, struct glyph_row *updated_row, int vpos)
                  break;
                }
-              rif->cursor_to (w, vpos, start_hpos, desired_row->y, start_x);
+              output_cursor_to (w, vpos, start_hpos, desired_row->y, start_x);
              rif->write_glyphs (w, updated_row, start,
                                 TEXT_AREA, i - start_hpos);
              changed_p = 1;
@@ -3707,7 +3668,7 @@ update_text_area (struct window *w, struct glyph_row *updated_row, int vpos)
      /* Write the rest.  */
      if (i < desired_row->used[TEXT_AREA])
        {
-          rif->cursor_to (w, vpos, i, desired_row->y, x);
+          output_cursor_to (w, vpos, i, desired_row->y, x);
          rif->write_glyphs (w, updated_row, desired_glyph,
                             TEXT_AREA, desired_row->used[TEXT_AREA] - i);
          changed_p = 1;
@@ -3729,8 +3690,8 @@ update_text_area (struct window *w, struct glyph_row *updated_row, int vpos)
        {
          /* If old row extends to the end of the text area, clear.  */
          if (i >= desired_row->used[TEXT_AREA])
-            rif->cursor_to (w, vpos, i, desired_row->y,
+            output_cursor_to (w, vpos, i, desired_row->y,
-                            desired_row->pixel_width);
+                              desired_row->pixel_width);
          rif->clear_end_of_line (w, updated_row, TEXT_AREA, -1);
          changed_p = 1;
        }
@@ -3741,8 +3702,8 @@ update_text_area (struct window *w, struct glyph_row *updated_row, int vpos)
          int xlim;
          if (i >= desired_row->used[TEXT_AREA])
-            rif->cursor_to (w, vpos, i, desired_row->y,
+            output_cursor_to (w, vpos, i, desired_row->y,
-                            desired_row->pixel_width);
+                              desired_row->pixel_width);
          /* If cursor is displayed at the end of the line, make sure
             it's cleared.  Nowadays we don't have a phys_cursor_glyph
@@ -3841,7 +3802,6 @@ static void
 set_window_cursor_after_update (struct window *w)
 {
  struct frame *f = XFRAME (w->frame);
-  struct redisplay_interface *rif = FRAME_RIF (f);
  int cx, cy, vpos, hpos;
  /* Not intended for frame matrix updates.  */
@@ -3913,7 +3873,7 @@ set_window_cursor_after_update (struct window *w)
     Horizontal position is -1 when cursor is on the left fringe.   */
  hpos = clip_to_bounds (-1, hpos, w->current_matrix->matrix_w - 1);
  vpos = clip_to_bounds (0, vpos, w->current_matrix->nrows - 1);
-  rif->cursor_to (w, vpos, hpos, cy, cx);
+  output_cursor_to (w, vpos, hpos, cy, cx);
 }
@@ -5078,9 +5038,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
     wrong thing with `face-remapping-alist' (bug#2044).  */
  Fset_buffer (w->contents);
  itdata = bidi_shelve_cache ();
-  SET_TEXT_POS_FROM_MARKER (startp, w->start);
+  CLIP_TEXT_POS_FROM_MARKER (startp, w->start);
-  CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp)));
-  BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp)));
  start_display (&it, w, startp);
  /* start_display takes into account the header-line row, but IT's
     vpos still counts from the glyph row that includes the window's
@@ -5560,7 +5518,7 @@ change_frame_size_1 (struct frame *f, int newheight, int newwidth,
      w->cursor.vpos = w->cursor.y = 0;
  }
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  calculate_costs (f);
  SET_FRAME_GARBAGED (f);
  f->resized_p = 1;
@@ -6186,19 +6144,6 @@ WINDOW nil or omitted means report on the selected window.  */)
 {
  return decode_any_window (window)->cursor_off_p ? Qnil : Qt;
 }
-DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame,
-       Slast_nonminibuf_frame, 0, 0, 0,
-       doc: /* Value is last nonminibuffer frame. */)
-  (void)
-{
-  Lisp_Object frame = Qnil;
-  if (last_nonminibuf_frame)
-    XSETFRAME (frame, last_nonminibuf_frame);
-  return frame;
-}
 /***********************************************************************
                            Initialization
@@ -6217,7 +6162,6 @@ syms_of_display (void)
  defsubr (&Ssend_string_to_terminal);
  defsubr (&Sinternal_show_cursor);
  defsubr (&Sinternal_show_cursor_p);
-  defsubr (&Slast_nonminibuf_frame);
 #ifdef GLYPH_DEBUG
  defsubr (&Sdump_redisplay_history);
diff --git a/src/editfns.c b/src/editfns.c
index 9e36655f3d3..84a5c8395fc 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -233,26 +233,12 @@ Beginning of buffer is position (point-min), end is (point-max).
 The return value is POSITION.  */)
  (register Lisp_Object position)
 {
-  ptrdiff_t pos;
+  if (MARKERP (position))
+    set_point_from_marker (position);
-  if (MARKERP (position)
+  else if (INTEGERP (position))
-      && current_buffer == XMARKER (position)->buffer)
+    SET_PT (clip_to_bounds (BEGV, XINT (position), ZV));
-    {
+  else
-      pos = marker_position (position);
+    wrong_type_argument (Qinteger_or_marker_p, position);
-      if (pos < BEGV)
-        SET_PT_BOTH (BEGV, BEGV_BYTE);
-      else if (pos > ZV)
-        SET_PT_BOTH (ZV, ZV_BYTE);
-      else
-        SET_PT_BOTH (pos, marker_byte_position (position));
-      return position;
-    }
-  CHECK_NUMBER_COERCE_MARKER (position);
-  pos = clip_to_bounds (BEGV, XINT (position), ZV);
-  SET_PT (pos);
  return position;
 }
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 8635ab652ac..1e57eeb57c4 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -20,15 +20,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
-#include "emacsgtkfixed.h"
-#include <stdio.h>
 #include "lisp.h"
 #include "frame.h"
 #include "xterm.h"
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
+#include "emacsgtkfixed.h"
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */
 #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__)
 # pragma GCC diagnostic push
diff --git a/src/eval.c b/src/eval.c
index 566be0c2a83..6e964f6604b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2033,7 +2033,9 @@ it is defines a macro.  */)
 DEFUN ("eval", Feval, Seval, 1, 2, 0,
       doc: /* Evaluate FORM and return its value.
-If LEXICAL is t, evaluate using lexical scoping.  */)
+If LEXICAL is t, evaluate using lexical scoping.
+LEXICAL can also be an actual lexical environment, in the form of an
+alist mapping symbols to their value.  */)
  (Lisp_Object form, Lisp_Object lexical)
 {
  ptrdiff_t count = SPECPDL_INDEX ();
@@ -2146,8 +2148,9 @@ eval_sub (Lisp_Object form)
  /* Optimize for no indirection.  */
  fun = original_fun;
-  if (SYMBOLP (fun) && !NILP (fun)
+  if (!SYMBOLP (fun))
-      && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
+    fun = Ffunction (Fcons (fun, Qnil));
+  else if (!NILP (fun) && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
    fun = indirect_function (fun);
  if (SUBRP (fun))
@@ -3151,20 +3154,17 @@ let_shadows_global_binding_p (Lisp_Object symbol)
  return 0;
 }
-/* `specpdl_ptr->symbol' is a field which describes which variable is
+/* `specpdl_ptr' describes which variable is
   let-bound, so it can be properly undone when we unbind_to.
-   It can have the following two shapes:
+   It can be either a plain SPECPDL_LET or a SPECPDL_LET_LOCAL/DEFAULT.
-   - SYMBOL : if it's a plain symbol, it means that we have let-bound
+   - SYMBOL is the variable being bound.  Note that it should not be
-     a symbol that is not buffer-local (at least at the time
-     the let binding started).  Note also that it should not be
     aliased (i.e. when let-binding V1 that's aliased to V2, we want
     to record V2 here).
-   - (SYMBOL WHERE . BUFFER) : this means that it is a let-binding for
+   - WHERE tells us in which buffer the binding took place.
-     variable SYMBOL which can be buffer-local.  WHERE tells us
+     This is used for SPECPDL_LET_LOCAL bindings (i.e. bindings to a
-     which buffer is affected (or nil if the let-binding affects the
+     buffer-local variable) as well as for SPECPDL_LET_DEFAULT bindings,
-     global value of the variable) and BUFFER tells us which buffer was
+     i.e. bindings to the default value of a variable which can be
-     current (i.e. if WHERE is non-nil, then BUFFER==WHERE, otherwise
+     buffer-local.  */
-     BUFFER did not yet have a buffer-local value).  */
 void
 specbind (Lisp_Object symbol, Lisp_Object value)
diff --git a/src/fileio.c b/src/fileio.c
index a751a73ae50..0e6113f349d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -233,7 +233,7 @@ void
 restore_point_unwind (Lisp_Object location)
 {
  Fgoto_char (location);
-  Fset_marker (location, Qnil, Qnil);
+  unchain_marker (XMARKER (location));
 }
diff --git a/src/font.c b/src/font.c
index 6a8262623dc..2606a25dff8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2866,14 +2866,14 @@ font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size)
    {
      FRAME_SMALLEST_CHAR_WIDTH (f) = min_width;
      FRAME_SMALLEST_FONT_HEIGHT (f) = height;
-      fonts_changed_p = 1;
+      f->fonts_changed = 1;
    }
  else
    {
      if (FRAME_SMALLEST_CHAR_WIDTH (f) > min_width)
-        FRAME_SMALLEST_CHAR_WIDTH (f) = min_width, fonts_changed_p = 1;
+        FRAME_SMALLEST_CHAR_WIDTH (f) = min_width, f->fonts_changed = 1;
      if (FRAME_SMALLEST_FONT_HEIGHT (f) > height)
-        FRAME_SMALLEST_FONT_HEIGHT (f) = height, fonts_changed_p = 1;
+        FRAME_SMALLEST_FONT_HEIGHT (f) = height, f->fonts_changed = 1;
    }
 #endif
@@ -3379,9 +3379,11 @@ register_font_driver (struct font_driver *driver, struct frame *f)
  struct font_driver_list *root = f ? f->font_driver_list : font_driver_list;
  struct font_driver_list *prev, *list;
+#ifdef HAVE_WINDOW_SYSTEM
  if (f && ! driver->draw)
    error ("Unusable font driver for a frame: %s",
           SDATA (SYMBOL_NAME (driver->type)));
+#endif /* HAVE_WINDOW_SYSTEM */
  for (prev = NULL, list = root; list; prev = list, list = list->next)
    if (EQ (list->driver->type, driver->type))
diff --git a/src/font.h b/src/font.h
index adb4a582fd8..3e0d97baaac 100644
--- a/src/font.h
+++ b/src/font.h
@@ -56,11 +56,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
-struct font_driver;
-struct font;
-struct glyph_string;
 /* An enumerator for each font property.  This is used as an index to
   the vector of FONT-SPEC and FONT-ENTITY.
@@ -487,8 +482,6 @@ struct font_bitmap
   this value.  */
 #define FONT_PIXEL_SIZE_QUANTUM 1
-struct face;
 #define FONT_INVALID_CODE 0xFFFFFFFF
 /* Font driver.  Members specified as "optional" can be NULL.  */
@@ -582,6 +575,8 @@ struct font_driver
                       unsigned *code, int nglyphs,
                       struct font_metrics *metrics);
+#ifdef HAVE_WINDOW_SYSTEM
  /* Optional.
     Draw glyphs between FROM and TO of S->char2b at (X Y) pixel
     position of frame F with S->FACE and S->GC.  If WITH_BACKGROUND,
@@ -602,6 +597,8 @@ struct font_driver
     Free bitmap data in BITMAP.  */
  void (*free_bitmap) (struct font *font, struct font_bitmap *bitmap);
+#endif /* HAVE_WINDOW_SYSTEM */
  /* Optional.
     Return an outline data for glyph-code CODE of FONT.  The format
     of the outline data depends on the font-driver.  */
diff --git a/src/fontset.c b/src/fontset.c
index 0bf716bf1b2..797d51ac0a7 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -39,17 +39,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "intervals.h"
 #include "fontset.h"
 #include "window.h"
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
-#include "xterm.h"
+#include TERM_HEADER
-#endif
+#endif /* HAVE_WINDOW_SYSTEM */
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
 #include "termhooks.h"
 #include "font.h"
 /* FONTSET
@@ -944,6 +937,19 @@ face_for_char (struct frame *f, struct face *face, int c, int pos, Lisp_Object o
  if (ASCII_CHAR_P (c) || face->fontset < 0)
    return face->ascii_face->id;
+#ifdef HAVE_NS
+  if (face->font)
+    {
+      /* Fonts often have characters in other scripts, like symbol, even if they
+         don't match script: symbol.  So check if the character is present
+         in the current face first.  Only enable for NS for now, but should
+         perhaps be general?  */
+      Lisp_Object font_object;
+      XSETFONT (font_object, face->font);
+      if (font_has_char (f, font_object, c)) return face->id;
+    }
+#endif
  eassert (fontset_id_valid_p (face->fontset));
  fontset = FONTSET_FROM_ID (face->fontset);
  eassert (!BASE_FONTSET_P (fontset));
diff --git a/src/fontset.h b/src/fontset.h
index fd16c7178f5..b8ef4789e71 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -26,8 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
-struct face;
 extern void free_face_fontset (struct frame *, struct face *);
 extern int face_for_char (struct frame *, struct face *, int,
                          int, Lisp_Object);
@@ -42,7 +40,6 @@ extern Lisp_Object Qlatin;
 extern Lisp_Object fontset_name (int);
 extern Lisp_Object fontset_ascii (int);
-struct font;
 extern int face_for_font (struct frame *, Lisp_Object, struct face *);
 #endif /* EMACS_FONTSET_H */
diff --git a/src/frame.c b/src/frame.c
index 5ee421bb9bf..692d224866c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -224,7 +224,7 @@ set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
      FRAME_WINDOW_SIZES_CHANGED (f) = 1;
      FRAME_MENU_BAR_LINES (f) = nlines;
      set_menu_bar_lines_1 (f->root_window, nlines - olines);
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
    }
 }
@@ -712,7 +712,7 @@ affects all frames on the same terminal device.  */)
    change_frame_size (f, height, width, 0, 0, 0);
  }
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  calculate_costs (f);
  XSETFRAME (frame, f);
@@ -1078,6 +1078,19 @@ Otherwise, include all frames.  */)
  CHECK_LIVE_FRAME (frame);
  return prev_frame (frame, miniframe);
 }
+DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame,
+       Slast_nonminibuf_frame, 0, 0, 0,
+       doc: /* Return last non-minibuffer frame selected. */)
+  (void)
+{
+  Lisp_Object frame = Qnil;
+  if (last_nonminibuf_frame)
+    XSETFRAME (frame, last_nonminibuf_frame);
+  return frame;
+}
 /* Return 1 if it is ok to delete frame F;
   0 if all frames aside from F are invisible.
@@ -1095,7 +1108,7 @@ other_visible_frames (struct frame *f)
      /* Verify that we can still talk to the frame's X window,
         and note any recent change in visibility.  */
-#ifdef HAVE_WINDOW_SYSTEM
+#ifdef HAVE_X_WINDOWS
      if (FRAME_WINDOW_P (XFRAME (this)))
        x_sync (XFRAME (this));
 #endif
@@ -1120,6 +1133,8 @@ check_minibuf_window (Lisp_Object frame, int select)
 {
  struct frame *f = decode_live_frame (frame);
+  XSETFRAME (frame, f);
  if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window))
    {
      Lisp_Object frames, this, window = make_number (0);
@@ -1137,9 +1152,8 @@ check_minibuf_window (Lisp_Object frame, int select)
              }
          }
-      if (!WINDOWP (window))
+      /* Don't abort if no window was found (Bug#15247).  */
-        emacs_abort ();
+      if (WINDOWP (window))
-      else
        {
          /* Use set_window_buffer instead of Fset_window_buffer (see
             discussion of bug#11984, bug#12025, bug#12026).  */
@@ -4493,6 +4507,7 @@ automatically.  See also `mouse-autoselect-window'.  */);
  defsubr (&Sframe_list);
  defsubr (&Snext_frame);
  defsubr (&Sprevious_frame);
+  defsubr (&Slast_nonminibuf_frame);
  defsubr (&Sdelete_frame);
  defsubr (&Smouse_position);
  defsubr (&Smouse_pixel_position);
diff --git a/src/frame.h b/src/frame.h
index 2dcb7562524..87e218ee938 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -24,31 +24,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_FRAME_H
 #include "dispextern.h"
+#include "termhooks.h"
 INLINE_HEADER_BEGIN
 #ifndef FRAME_INLINE
 # define FRAME_INLINE INLINE
 #endif
-/* Miscellanea.  */
-/* Nonzero means there is at least one garbaged frame.  */
-extern bool frame_garbaged;
-/* The structure representing a frame.  */
-enum output_method
-{
-  output_initial,
-  output_termcap,
-  output_x_window,
-  output_msdos_raw,
-  output_w32,
-  output_ns
-};
 enum vertical_scroll_bar_type
 {
  vertical_scroll_bar_none,
@@ -66,10 +48,7 @@ enum fullscreen_type
  FULLSCREEN_WAIT      = 0x100
 };
+/* The structure representing a frame.  */
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel)
 struct frame
 {
@@ -206,10 +185,6 @@ struct frame
     Clear the frame in clear_garbaged_frames if set.  */
  unsigned resized_p : 1;
-  /* Set to non-zero in when we want for force a flush_display in
-     update_frame, usually after resizing the frame.  */
-  unsigned force_flush_display_p : 1;
  /* Set to non-zero if the default face for the frame has been
     realized.  Reset to zero whenever the default face changes.
     Used to see the difference between a font change and face change.  */
@@ -231,6 +206,13 @@ struct frame
  unsigned external_tool_bar : 1;
 #endif
+  /* Nonzero means that fonts have been loaded since the last glyph
+     matrix adjustments.  */
+  unsigned fonts_changed : 1;
+  /* Nonzero means that cursor type has been changed.  */
+  unsigned cursor_type_changed : 1;
  /* Margin at the top of the frame.  Used to display the tool-bar.  */
  int tool_bar_lines;
@@ -884,6 +866,9 @@ default_pixels_per_inch_y (void)
 #define FRAME_CURSOR_WIDTH(f) ((f)->cursor_width)
 #define FRAME_BLINK_OFF_CURSOR_WIDTH(f) ((f)->blink_off_cursor_width)
+#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel)
+#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel)
 /* Return a pointer to the face cache of frame F.  */
 #define FRAME_FACE_CACHE(F)     (F)->face_cache
@@ -950,6 +935,9 @@ extern Lisp_Object Qtty_color_mode;
 extern Lisp_Object Qterminal;
 extern Lisp_Object Qnoelisp;
+/* Nonzero means there is at least one garbaged frame.  */
+extern bool frame_garbaged;
 extern struct frame *last_nonminibuf_frame;
 extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
@@ -1251,7 +1239,6 @@ extern Lisp_Object display_x_get_resource (Display_Info *,
 extern void set_frame_menubar (struct frame *f, bool first_time, bool deep_p);
 extern void x_set_window_size (struct frame *f, int change_grav,
                              int cols, int rows);
-extern void x_sync (struct frame *);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 extern void x_set_mouse_position (struct frame *f, int h, int v);
 extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
@@ -1277,13 +1264,24 @@ extern void x_wm_set_icon_position (struct frame *, int, int);
 #if !defined USE_X_TOOLKIT
 extern char *x_get_resource_string (const char *, const char *);
 #endif
-#endif
+extern void x_sync (struct frame *);
+#endif /* HAVE_X_WINDOWS */
 extern void x_query_colors (struct frame *f, XColor *, int);
 extern void x_query_color (struct frame *f, XColor *);
 #endif /* HAVE_WINDOW_SYSTEM */
+FRAME_INLINE void
+flush_frame (struct frame *f)
+{
+  struct redisplay_interface *rif = FRAME_RIF (f);
+  if (rif && rif->flush_display)
+    rif->flush_display (f);
+}
 /***********************************************************************
                        Multimonitor data
 ***********************************************************************/
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8f13c72df81..7415c3a2413 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -249,7 +249,9 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.  */)
 void
 globals_of_gfilenotify (void)
 {
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
  g_type_init ();
+#endif
  watch_list = Qnil;
 }
diff --git a/src/gtkutil.c b/src/gtkutil.c
index f03ca592834..6228f2150f5 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -872,29 +872,23 @@ xg_clear_under_internal_border (struct frame *f)
  if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0)
    {
      GtkWidget *wfixed = f->output_data.x->edit_widget;
      gtk_widget_queue_draw (wfixed);
      gdk_window_process_all_updates ();
-      x_clear_area (FRAME_X_DISPLAY (f),
-                    FRAME_X_WINDOW (f),
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 0, 0,
-                    0, 0,
+                    FRAME_PIXEL_WIDTH (f), FRAME_INTERNAL_BORDER_WIDTH (f));
-                    FRAME_PIXEL_WIDTH (f),
-                    FRAME_INTERNAL_BORDER_WIDTH (f), 0);
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 0, 0,
-      x_clear_area (FRAME_X_DISPLAY (f),
+                    FRAME_INTERNAL_BORDER_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
-                    FRAME_X_WINDOW (f),
-                    0, 0,
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 0,
-                    FRAME_INTERNAL_BORDER_WIDTH (f),
+                    FRAME_PIXEL_HEIGHT (f) - FRAME_INTERNAL_BORDER_WIDTH (f),
-                    FRAME_PIXEL_HEIGHT (f), 0);
+                    FRAME_PIXEL_WIDTH (f), FRAME_INTERNAL_BORDER_WIDTH (f));
-      x_clear_area (FRAME_X_DISPLAY (f),
-                    FRAME_X_WINDOW (f),
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    0, FRAME_PIXEL_HEIGHT (f) - FRAME_INTERNAL_BORDER_WIDTH (f),
+                    FRAME_PIXEL_WIDTH (f) - FRAME_INTERNAL_BORDER_WIDTH (f),
-                    FRAME_PIXEL_WIDTH (f),
+                    0, FRAME_INTERNAL_BORDER_WIDTH (f), FRAME_PIXEL_HEIGHT (f));
-                    FRAME_INTERNAL_BORDER_WIDTH (f), 0);
-      x_clear_area (FRAME_X_DISPLAY (f),
-                    FRAME_X_WINDOW (f),
-                    FRAME_PIXEL_WIDTH (f) - FRAME_INTERNAL_BORDER_WIDTH (f),
-                    0,
-                    FRAME_INTERNAL_BORDER_WIDTH (f),
-                    FRAME_PIXEL_HEIGHT (f), 0);
    }
 }
@@ -3751,14 +3745,11 @@ xg_update_scrollbar_pos (struct frame *f,
      gtk_widget_queue_draw (wfixed);
      gdk_window_process_all_updates ();
      if (oldx != -1 && oldw > 0 && oldh > 0)
-        {
+        /* Clear under old scroll bar position.  This must be done after
-          /* Clear under old scroll bar position.  This must be done after
+           the gtk_widget_queue_draw and gdk_window_process_all_updates
-             the gtk_widget_queue_draw and gdk_window_process_all_updates
+           above.  */
-             above.  */
+        x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-          x_clear_area (FRAME_X_DISPLAY (f),
+                      oldx, oldy, oldw, oldh);
-                        FRAME_X_WINDOW (f),
-                        oldx, oldy, oldw, oldh, 0);
-        }
      /* GTK does not redraw until the main loop is entered again, but
         if there are no X events pending we will not enter it.  So we sync
@@ -3792,7 +3783,7 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
  struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
-  if (wscroll && NILP (bar->dragging))
+  if (wscroll && bar->dragging == -1)
    {
      GtkAdjustment *adj;
      gdouble shown;
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 482331a8934..fc959862fd3 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -74,8 +74,6 @@ typedef struct xg_menu_item_cb_data_
 } xg_menu_item_cb_data;
-struct _widget_value;
 extern struct _widget_value *malloc_widget_value (void);
 extern void free_widget_value (struct _widget_value *);
diff --git a/src/image.c b/src/image.c
index bcc0fcd78a3..1271376bcab 100644
--- a/src/image.c
+++ b/src/image.c
@@ -30,13 +30,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #include <setjmp.h>
 #include <c-ctype.h>
-/* This makes the fields of a Display accessible, in Xlib header files.  */
-#define XLIB_ILLEGAL_ACCESS
 #include "lisp.h"
 #include "frame.h"
 #include "window.h"
diff --git a/src/indent.c b/src/indent.c
index 6aaf86579d7..891b42788ed 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -510,15 +510,10 @@ scan_for_column (ptrdiff_t *endpos, EMACS_INT *goalcol, ptrdiff_t *prevcol)
  register ptrdiff_t col = 0, prev_col = 0;
  EMACS_INT goal = goalcol ? *goalcol : MOST_POSITIVE_FIXNUM;
  ptrdiff_t end = endpos ? *endpos : PT;
-  ptrdiff_t scan, scan_byte;
+  ptrdiff_t scan, scan_byte, next_boundary;
-  ptrdiff_t next_boundary;
-  {
+  scan = find_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, NULL, &scan_byte, 1);
-  ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
-  scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
-  scan = PT, scan_byte = PT_BYTE;
-  SET_PT_BOTH (opoint, opoint_byte);
  next_boundary = scan;
-  }
  window = Fget_buffer_window (Fcurrent_buffer (), Qnil);
  w = ! NILP (window) ? XWINDOW (window) : NULL;
@@ -835,14 +830,10 @@ This is the horizontal position of the character
 following any initial whitespace.  */)
  (void)
 {
-  Lisp_Object val;
+  ptrdiff_t posbyte;
-  ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
-  scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
-  XSETFASTINT (val, position_indentation (PT_BYTE));
+  find_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, NULL, &posbyte, 1);
-  SET_PT_BOTH (opoint, opoint_byte);
+  return make_number (position_indentation (posbyte));
-  return val;
 }
 static ptrdiff_t
@@ -935,16 +926,13 @@ position_indentation (ptrdiff_t pos_byte)
 bool
 indented_beyond_p (ptrdiff_t pos, ptrdiff_t pos_byte, EMACS_INT column)
 {
-  ptrdiff_t val;
+  while (pos > BEGV && FETCH_BYTE (pos_byte) == '\n')
-  ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
+    {
+      DEC_BOTH (pos, pos_byte);
-  SET_PT_BOTH (pos, pos_byte);
+      pos = find_newline (pos, pos_byte, BEGV, BEGV_BYTE,
-  while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
+                          -1, NULL, &pos_byte, 0);
-    scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0);
+    }
+  return position_indentation (pos_byte) >= column;
-  val = position_indentation (PT_BYTE);
-  SET_PT_BOTH (opoint, opoint_byte);
-  return val >= column;
 }
 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2,
diff --git a/src/intervals.c b/src/intervals.c
index f2ddcd01507..ded536ca3c8 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1821,6 +1821,18 @@ set_point (ptrdiff_t charpos)
  set_point_both (charpos, buf_charpos_to_bytepos (current_buffer, charpos));
 }
+/* Set PT from MARKER's clipped position.  */
+void
+set_point_from_marker (Lisp_Object marker)
+{
+  if (XMARKER (marker)->buffer != current_buffer)
+    signal_error ("Marker points into wrong buffer", marker);
+  set_point_both
+    (clip_to_bounds (BEGV, marker_position (marker), ZV),
+     clip_to_bounds (BEGV_BYTE, marker_byte_position (marker), ZV_BYTE));
+}
 /* If there's an invisible character at position POS + TEST_OFFS in the
   current buffer, and the invisible property has a `stickiness' such that
   inserting a character at position POS would inherit the property it,
diff --git a/src/keyboard.c b/src/keyboard.c
index a2f772dea8a..5996986bfb4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -425,7 +425,9 @@ static Lisp_Object modify_event_symbol (ptrdiff_t, int, Lisp_Object,
                                        Lisp_Object *, ptrdiff_t);
 static Lisp_Object make_lispy_switch_frame (Lisp_Object);
 static Lisp_Object make_lispy_focus_in (Lisp_Object);
+#ifdef HAVE_WINDOW_SYSTEM
 static Lisp_Object make_lispy_focus_out (Lisp_Object);
+#endif /* HAVE_WINDOW_SYSTEM */
 static bool help_char_p (Lisp_Object);
 static void save_getcjmp (sys_jmp_buf);
 static void restore_getcjmp (sys_jmp_buf);
@@ -3213,6 +3215,8 @@ read_char (int commandflag, Lisp_Object map,
  RETURN_UNGCPRO (c);
 }
+#ifdef HAVE_MENUS
 /* Record a key that came from a mouse menu.
   Record it for echoing, for this-command-keys, and so on.  */
@@ -3248,6 +3252,8 @@ record_menu_key (Lisp_Object c)
  num_input_events++;
 }
+#endif /* HAVE_MENUS */
 /* Return true if should recognize C as "the help character".  */
 static bool
@@ -6095,12 +6101,17 @@ make_lispy_focus_in (Lisp_Object frame)
 {
  return list2 (Qfocus_in, frame);
 }
+#ifdef HAVE_WINDOW_SYSTEM
 static Lisp_Object
 make_lispy_focus_out (Lisp_Object frame)
 {
  return list2 (Qfocus_out, frame);
 }
+#endif /* HAVE_WINDOW_SYSTEM */
 /* Manipulating modifiers.  */
 /* Parse the name of SYMBOL, and return the set of modifiers it contains.
@@ -9738,54 +9749,11 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
  return t;
 }
-DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
+static Lisp_Object
-       doc: /* Read a sequence of keystrokes and return as a string or vector.
+read_key_sequence_vs (Lisp_Object prompt, Lisp_Object continue_echo,
-The sequence is sufficient to specify a non-prefix command in the
+                      Lisp_Object dont_downcase_last,
-current local and global maps.
+                      Lisp_Object can_return_switch_frame,
+                      Lisp_Object cmd_loop, bool allow_string)
-First arg PROMPT is a prompt string.  If nil, do not prompt specially.
-Second (optional) arg CONTINUE-ECHO, if non-nil, means this key echos
-as a continuation of the previous key.
-The third (optional) arg DONT-DOWNCASE-LAST, if non-nil, means do not
-convert the last event to lower case.  (Normally any upper case event
-is converted to lower case if the original event is undefined and the lower
-case equivalent is defined.)  A non-nil value is appropriate for reading
-a key sequence to be defined.
-A C-g typed while in this function is treated like any other character,
-and `quit-flag' is not set.
-If the key sequence starts with a mouse click, then the sequence is read
-using the keymaps of the buffer of the window clicked in, not the buffer
-of the selected window as normal.
-`read-key-sequence' drops unbound button-down events, since you normally
-only care about the click or drag events which follow them.  If a drag
-or multi-click event is unbound, but the corresponding click event would
-be bound, `read-key-sequence' turns the event into a click event at the
-drag's starting position.  This means that you don't have to distinguish
-between click and drag, double, or triple events unless you want to.
-`read-key-sequence' prefixes mouse events on mode lines, the vertical
-lines separating windows, and scroll bars with imaginary keys
-`mode-line', `vertical-line', and `vertical-scroll-bar'.
-Optional fourth argument CAN-RETURN-SWITCH-FRAME non-nil means that this
-function will process a switch-frame event if the user switches frames
-before typing anything.  If the user switches frames in the middle of a
-key sequence, or at the start of the sequence but CAN-RETURN-SWITCH-FRAME
-is nil, then the event will be put off until after the current key sequence.
-`read-key-sequence' checks `function-key-map' for function key
-sequences, where they wouldn't conflict with ordinary bindings.  See
-`function-key-map' for more details.
-The optional fifth argument CMD-LOOP, if non-nil, means
-that this key sequence is being read by something that will
-read commands one after another.  It should be nil if the caller
-will read just one key sequence.  */)
-  (Lisp_Object prompt, Lisp_Object continue_echo, Lisp_Object dont_downcase_last, Lisp_Object can_return_switch_frame, Lisp_Object cmd_loop)
 {
  Lisp_Object keybuf[30];
  register int i;
@@ -9836,60 +9804,71 @@ will read just one key sequence.  */)
      QUIT;
    }
  UNGCPRO;
-  return unbind_to (count, make_event_array (i, keybuf));
+  return unbind_to (count,
+                    ((allow_string ? make_event_array : Fvector)
+                     (i, keybuf)));
 }
-DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
+DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
-       Sread_key_sequence_vector, 1, 5, 0,
+       doc: /* Read a sequence of keystrokes and return as a string or vector.
-       doc: /* Like `read-key-sequence' but always return a vector.  */)
+The sequence is sufficient to specify a non-prefix command in the
-  (Lisp_Object prompt, Lisp_Object continue_echo, Lisp_Object dont_downcase_last, Lisp_Object can_return_switch_frame, Lisp_Object cmd_loop)
+current local and global maps.
-{
-  Lisp_Object keybuf[30];
-  register int i;
-  struct gcpro gcpro1;
-  ptrdiff_t count = SPECPDL_INDEX ();
-  if (!NILP (prompt))
+First arg PROMPT is a prompt string.  If nil, do not prompt specially.
-    CHECK_STRING (prompt);
+Second (optional) arg CONTINUE-ECHO, if non-nil, means this key echos
-  QUIT;
+as a continuation of the previous key.
-  specbind (Qinput_method_exit_on_first_char,
+The third (optional) arg DONT-DOWNCASE-LAST, if non-nil, means do not
-            (NILP (cmd_loop) ? Qt : Qnil));
+convert the last event to lower case.  (Normally any upper case event
-  specbind (Qinput_method_use_echo_area,
+is converted to lower case if the original event is undefined and the lower
-            (NILP (cmd_loop) ? Qt : Qnil));
+case equivalent is defined.)  A non-nil value is appropriate for reading
+a key sequence to be defined.
-  memset (keybuf, 0, sizeof keybuf);
+A C-g typed while in this function is treated like any other character,
-  GCPRO1 (keybuf[0]);
+and `quit-flag' is not set.
-  gcpro1.nvars = (sizeof keybuf / sizeof (keybuf[0]));
-  if (NILP (continue_echo))
+If the key sequence starts with a mouse click, then the sequence is read
-    {
+using the keymaps of the buffer of the window clicked in, not the buffer
-      this_command_key_count = 0;
+of the selected window as normal.
-      this_command_key_count_reset = 0;
-      this_single_command_key_start = 0;
-    }
-#ifdef HAVE_WINDOW_SYSTEM
+`read-key-sequence' drops unbound button-down events, since you normally
-  if (display_hourglass_p)
+only care about the click or drag events which follow them.  If a drag
-    cancel_hourglass ();
+or multi-click event is unbound, but the corresponding click event would
-#endif
+be bound, `read-key-sequence' turns the event into a click event at the
+drag's starting position.  This means that you don't have to distinguish
+between click and drag, double, or triple events unless you want to.
-  i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])),
+`read-key-sequence' prefixes mouse events on mode lines, the vertical
-                         prompt, ! NILP (dont_downcase_last),
+lines separating windows, and scroll bars with imaginary keys
-                         ! NILP (can_return_switch_frame), 0);
+`mode-line', `vertical-line', and `vertical-scroll-bar'.
-#ifdef HAVE_WINDOW_SYSTEM
+Optional fourth argument CAN-RETURN-SWITCH-FRAME non-nil means that this
-  if (display_hourglass_p)
+function will process a switch-frame event if the user switches frames
-    start_hourglass ();
+before typing anything.  If the user switches frames in the middle of a
-#endif
+key sequence, or at the start of the sequence but CAN-RETURN-SWITCH-FRAME
+is nil, then the event will be put off until after the current key sequence.
-  if (i == -1)
+`read-key-sequence' checks `function-key-map' for function key
-    {
+sequences, where they wouldn't conflict with ordinary bindings.  See
-      Vquit_flag = Qt;
+`function-key-map' for more details.
-      QUIT;
-    }
+The optional fifth argument CMD-LOOP, if non-nil, means
-  UNGCPRO;
+that this key sequence is being read by something that will
-  return unbind_to (count, Fvector (i, keybuf));
+read commands one after another.  It should be nil if the caller
+will read just one key sequence.  */)
+  (Lisp_Object prompt, Lisp_Object continue_echo, Lisp_Object dont_downcase_last, Lisp_Object can_return_switch_frame, Lisp_Object cmd_loop)
+{
+  return read_key_sequence_vs (prompt, continue_echo, dont_downcase_last,
+                               can_return_switch_frame, cmd_loop, true);
+}
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
+       Sread_key_sequence_vector, 1, 5, 0,
+       doc: /* Like `read-key-sequence' but always return a vector.  */)
+  (Lisp_Object prompt, Lisp_Object continue_echo, Lisp_Object dont_downcase_last, Lisp_Object can_return_switch_frame, Lisp_Object cmd_loop)
+{
+  return read_key_sequence_vs (prompt, continue_echo, dont_downcase_last,
+                               can_return_switch_frame, cmd_loop, false);
 }
 /* Return true if input events are pending.  */
@@ -9920,20 +9899,7 @@ detect_input_pending_run_timers (bool do_display)
    get_input_pending (READABLE_EVENTS_DO_TIMERS_NOW);
  if (old_timers_run != timers_run && do_display)
-    {
+    redisplay_preserve_echo_area (8);
-      redisplay_preserve_echo_area (8);
-      /* The following fixes a bug when using lazy-lock with
-         lazy-lock-defer-on-the-fly set to t, i.e.  when fontifying
-         from an idle timer function.  The symptom of the bug is that
-         the cursor sometimes doesn't become visible until the next X
-         event is processed.  --gerd.  */
-      {
-        Lisp_Object tail, frame;
-        FOR_EACH_FRAME (tail, frame)
-          if (FRAME_RIF (XFRAME (frame)))
-            FRAME_RIF (XFRAME (frame))->flush_display (XFRAME (frame));
-      }
-    }
  return input_pending;
 }
diff --git a/src/keyboard.h b/src/keyboard.h
index 0953f1b7cfd..1ee4a97c5c5 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systime.h"            /* for struct timespec, Time */
 #include "coding.h"             /* for ENCODE_UTF_8 and ENCODE_SYSTEM */
+#include "termhooks.h"
 INLINE_HEADER_BEGIN
 #ifndef KEYBOARD_INLINE
@@ -477,9 +478,6 @@ extern bool ignore_mouse_drag_p;
 /* The primary selection.  */
 extern Lisp_Object QPRIMARY;
-/* Forward declaration for prototypes.  */
-struct input_event;
 extern Lisp_Object parse_modifiers (Lisp_Object);
 extern Lisp_Object reorder_modifiers (Lisp_Object);
 extern Lisp_Object read_char (int, Lisp_Object, Lisp_Object,
diff --git a/src/lisp.h b/src/lisp.h
index ef5e54d8cb6..dce1b17146b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -871,11 +871,7 @@ make_lisp_proc (struct Lisp_Process *p)
 #define XSETSTRING(a, b) ((a) = make_lisp_ptr (b, Lisp_String))
 #define XSETSYMBOL(a, b) ((a) = make_lisp_ptr (b, Lisp_Symbol))
 #define XSETFLOAT(a, b) ((a) = make_lisp_ptr (b, Lisp_Float))
-/* Misc types.  */
 #define XSETMISC(a, b) ((a) = make_lisp_ptr (b, Lisp_Misc))
-#define XSETMARKER(a, b) (XSETMISC (a, b), XMISCTYPE (a) = Lisp_Misc_Marker)
 /* Pseudovector types.  */
@@ -2639,19 +2635,6 @@ typedef jmp_buf sys_jmp_buf;
   they are bound by a function application or a let form, stores the
   code to be executed for unwind-protect forms.
-   If func is non-zero, undoing this binding applies func to old_value;
-      This implements record_unwind_protect.
-   Otherwise, the element is a variable binding.
-   If the symbol field is a symbol, it is an ordinary variable binding.
-   Otherwise, it should be a structure (SYMBOL WHERE . CURRENT-BUFFER),
-   which means having bound a local value while CURRENT-BUFFER was active.
-   If WHERE is nil this means we saw the default value when binding SYMBOL.
-   WHERE being a buffer or frame means we saw a buffer-local or frame-local
-   value.  Other values of WHERE mean an internal error.
   NOTE: The specbinding union is defined here, because SPECPDL_INDEX is
   used all over the place, needs to be fast, and needs to know the size of
   union specbinding.  But only eval.c should access it.  */
@@ -3381,9 +3364,6 @@ extern Lisp_Object Qglyphless_char;
 extern Lisp_Object QCdata, QCfile;
 extern Lisp_Object QCmap;
 extern Lisp_Object Qrisky_local_variable;
-extern struct frame *last_glyphless_glyph_frame;
-extern int last_glyphless_glyph_face_id;
-extern int last_glyphless_glyph_merged_face_id;
 extern int noninteractive_need_newline;
 extern Lisp_Object echo_area_buffer[2];
 extern void add_to_log (const char *, Lisp_Object, Lisp_Object);
@@ -3485,7 +3465,7 @@ build_unibyte_string (const char *str)
 }
 extern Lisp_Object make_multibyte_string (const char *, ptrdiff_t, ptrdiff_t);
-extern Lisp_Object make_event_array (int, Lisp_Object *);
+extern Lisp_Object make_event_array (ptrdiff_t, Lisp_Object *);
 extern Lisp_Object make_uninit_string (EMACS_INT);
 extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT);
 extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t);
@@ -3839,8 +3819,8 @@ extern ptrdiff_t fast_looking_at (Lisp_Object, ptrdiff_t, ptrdiff_t,
                                  ptrdiff_t, ptrdiff_t, Lisp_Object);
 extern ptrdiff_t find_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
                               ptrdiff_t, ptrdiff_t *, ptrdiff_t *, bool);
-extern EMACS_INT scan_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
+extern ptrdiff_t scan_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
-                               EMACS_INT, bool);
+                               ptrdiff_t, bool);
 extern ptrdiff_t find_newline_no_quit (ptrdiff_t, ptrdiff_t,
                                       ptrdiff_t, ptrdiff_t *);
 extern ptrdiff_t find_before_next_newline (ptrdiff_t, ptrdiff_t,
diff --git a/src/minibuf.c b/src/minibuf.c
index 7403fc6c32d..cc6f234f7da 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -672,12 +672,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
      XWINDOW (minibuf_window)->cursor.x = 0;
      XWINDOW (minibuf_window)->must_be_updated_p = 1;
      update_frame (XFRAME (selected_frame), 1, 1);
-      {
+      flush_frame (XFRAME (XWINDOW (minibuf_window)->frame));
-        struct frame *f = XFRAME (XWINDOW (minibuf_window)->frame);
-        struct redisplay_interface *rif = FRAME_RIF (f);
-        if (rif && rif->flush_display)
-          rif->flush_display (f);
-      }
    }
  /* Make minibuffer contents into a string.  */
diff --git a/src/msdos.c b/src/msdos.c
index 3c78efbc47b..7142c3ada77 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -946,9 +946,6 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
                          Mouse Highlight (and friends..)
 ************************************************************************/
-/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
-static Lisp_Object last_mouse_window;
 static int mouse_preempted = 0; /* non-zero when XMenu gobbles mouse events */
 int
@@ -1546,11 +1543,6 @@ IT_reset_terminal_modes (struct terminal *term)
  term_setup_done = 0;
 }
-static void
-IT_set_terminal_window (struct frame *f, int foo)
-{
-}
 /* Remember the screen colors of the current frame, to serve as the
   default colors for newly-created frames.  */
 DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
@@ -1871,7 +1863,7 @@ initialize_msdos_display (struct terminal *term)
  term->ring_bell_hook = IT_ring_bell;
  term->reset_terminal_modes_hook = IT_reset_terminal_modes;
  term->set_terminal_modes_hook = IT_set_terminal_modes;
-  term->set_terminal_window_hook = IT_set_terminal_window;
+  term->set_terminal_window_hook = NULL;
  term->update_begin_hook = IT_update_begin;
  term->update_end_hook = IT_update_end;
  term->frame_up_to_date_hook = IT_frame_up_to_date;
@@ -2673,10 +2665,10 @@ dos_rawgetc (void)
          /* Generate SELECT_WINDOW_EVENTs when needed.  */
          if (!NILP (Vmouse_autoselect_window))
            {
-              mouse_window = window_from_coordinates (SELECTED_FRAME (),
+              static Lisp_Object last_mouse_window;
-                                                      mouse_last_x,
-                                                      mouse_last_y,
+              mouse_window = window_from_coordinates
-                                                      0, 0);
+                (SELECTED_FRAME (), mouse_last_x, mouse_last_y, 0, 0);
              /* A window will be selected only when it is not
                 selected now, and the last mouse movement event was
                 not in it.  A minibuffer window will be selected iff
@@ -2691,10 +2683,9 @@ dos_rawgetc (void)
                  event.timestamp = event_timestamp ();
                  kbd_buffer_store_event (&event);
                }
+              /* Remember the last window where we saw the mouse.  */
              last_mouse_window = mouse_window;
            }
-          else
-            last_mouse_window = Qnil;
          previous_help_echo_string = help_echo_string;
          help_echo_string = help_echo_object = help_echo_window = Qnil;
diff --git a/src/nsfns.m b/src/nsfns.m
index fc276c2b12d..f021e834d59 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2231,15 +2231,6 @@ x_get_focus_frame (struct frame *frame)
  return nsfocus;
 }
-void
-x_sync (struct frame *f)
-{
-  /* XXX Not implemented XXX */
-  return;
-}
 /* ==========================================================================
    Lisp definitions that, for whatever reason, we can't alias as 'ns-XXX'.
diff --git a/src/nsfont.m b/src/nsfont.m
index 235150e3aef..e1c7d32dde0 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -61,6 +61,7 @@ static void ns_uni_to_glyphs (struct nsfont_info *font_info,
 static void ns_glyph_metrics (struct nsfont_info *font_info,
                              unsigned char block);
+#define INVALID_GLYPH 0xFFFF
 /* ==========================================================================
@@ -981,7 +982,7 @@ nsfont_encode_char (struct font *font, int c)
    ns_uni_to_glyphs (font_info, high);
  g = font_info->glyphs[high][low];
-  return g == 0xFFFF ? FONT_INVALID_CODE : g;
+  return g == INVALID_GLYPH ? FONT_INVALID_CODE : g;
 }
@@ -1354,8 +1355,8 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block)
 #else
        g = glyphStorage->cglyphs[i];
        /* TODO: is this a good check?  maybe need to use coveredChars.. */
-        if (g > numGlyphs)
+        if (g > numGlyphs || g == NSNullGlyph)
-          g = 0xFFFF; /* hopefully unused... */
+          g = INVALID_GLYPH; /* hopefully unused... */
 #endif
        *glyphs = g;
      }
@@ -1483,7 +1484,7 @@ ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block)
        characterIndex: (NSUInteger)charIndex
 {
  len = glyphIndex+length;
-  for (i =glyphIndex; i<len; i++)
+  for (i =glyphIndex; i<len; i++) 
    cglyphs[i] = glyphs[i-glyphIndex];
  if (len > maxGlyph)
    maxGlyph = len;
diff --git a/src/nsterm.m b/src/nsterm.m
index ec365df0c22..38d76e9389c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -308,8 +308,13 @@ static CGPoint menu_mouse_point;
 /* This is a piece of code which is common to all the event handling
   methods.  Maybe it should even be a function.  */
 #define EV_TRAILER(e)                                                   \
-    {                                                                   \
+  {                                                                     \
-      XSETFRAME (emacs_event->frame_or_window, emacsframe);             \
+    XSETFRAME (emacs_event->frame_or_window, emacsframe);               \
+    EV_TRAILER2 (e);                                                    \
+  }
+#define EV_TRAILER2(e)                                                  \
+  {                                                                     \
      if (e) emacs_event->timestamp = EV_TIMESTAMP (e);                 \
      if (q_event_ptr)                                                  \
        {                                                               \
@@ -720,7 +725,7 @@ ns_update_window_begin (struct window *w)
  Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
  NSTRACE (ns_update_window_begin);
-  set_output_cursor (&w->cursor);
+  w->output_cursor = w->cursor;
  block_input ();
@@ -756,8 +761,8 @@ ns_update_window_end (struct window *w, bool cursor_on_p,
      if (cursor_on_p)
        display_and_set_cursor (w, 1,
-                                output_cursor.hpos, output_cursor.vpos,
+                                w->output_cursor.hpos, w->output_cursor.vpos,
-                                output_cursor.x, output_cursor.y);
+                                w->output_cursor.x, w->output_cursor.y);
      if (draw_window_fringes (w, 1))
        x_draw_vertical_border (w);
@@ -796,18 +801,6 @@ ns_update_end (struct frame *f)
  NSTRACE (ns_update_end);
 }
-static void
-ns_flush (struct frame *f)
-/* --------------------------------------------------------------------------
-   external (RIF) call
-   NS impl is no-op since currently we flush in ns_update_end and elsewhere
-   -------------------------------------------------------------------------- */
-{
-    NSTRACE (ns_flush);
-}
 static void
 ns_focus (struct frame *f, NSRect *r, int n)
 /* --------------------------------------------------------------------------
@@ -885,7 +878,8 @@ ns_unfocus (struct frame *f)
 static void
-ns_clip_to_row (struct window *w, struct glyph_row *row, int area, BOOL gc)
+ns_clip_to_row (struct window *w, struct glyph_row *row,
+                enum glyph_row_area area, BOOL gc)
 /* --------------------------------------------------------------------------
     Internal (but parallels other terms): Focus drawing on given row
   -------------------------------------------------------------------------- */
@@ -954,24 +948,6 @@ ns_ring_bell (struct frame *f)
    }
 }
-static void
-ns_reset_terminal_modes (struct terminal *terminal)
-/*  Externally called as hook */
-{
-  NSTRACE (ns_reset_terminal_modes);
-}
-static void
-ns_set_terminal_modes (struct terminal *terminal)
-/*  Externally called as hook */
-{
-  NSTRACE (ns_set_terminal_modes);
-}
 /* ==========================================================================
    Frame / window manager related functions
@@ -1989,9 +1965,6 @@ ns_clear_frame (struct frame *f)
  mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f)));
-  output_cursor.hpos = output_cursor.vpos = 0;
-  output_cursor.x = -1;
  r = [view bounds];
  block_input ();
@@ -2047,7 +2020,7 @@ ns_scroll_run (struct window *w, struct run *run)
  /* Get frame-relative bounding box of the text display area of W,
     without mode lines.  Include in this box the left and right
     fringe of W.  */
-  window_box (w, -1, &x, &y, &width, &height);
+  window_box (w, ANY_AREA, &x, &y, &width, &height);
  from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y);
  to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y);
@@ -2222,7 +2195,7 @@ ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
    }
  /* Must clip because of partially visible lines.  */
-  ns_clip_to_row (w, row, -1, YES);
+  ns_clip_to_row (w, row, ANY_AREA, YES);
  if (!p->overlay_p)
    {
@@ -2402,7 +2375,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
  /* TODO: only needed in rare cases with last-resort font in HELLO..
     should we do this more efficiently? */
-  ns_clip_to_row (w, glyph_row, -1, NO); /* do ns_focus(f, &r, 1); if remove */
+  ns_clip_to_row (w, glyph_row, ANY_AREA, NO); /* do ns_focus(f, &r, 1); if remove */
  face = FACE_FROM_ID (f, phys_cursor_glyph->face_id);
@@ -3713,7 +3686,7 @@ ns_set_vertical_scroll_bar (struct window *window,
  NSTRACE (ns_set_vertical_scroll_bar);
  /* Get dimensions.  */
-  window_box (window, -1, 0, &window_y, 0, &window_height);
+  window_box (window, ANY_AREA, 0, &window_y, 0, &window_height);
  top = window_y;
  height = window_height;
  width = WINDOW_CONFIG_SCROLL_BAR_COLS (window) * FRAME_COLUMN_WIDTH (f);
@@ -3978,9 +3951,7 @@ static struct redisplay_interface ns_redisplay_interface =
  ns_after_update_window_line,
  ns_update_window_begin,
  ns_update_window_end,
-  x_cursor_to,
+  0, /* flush_display */
-  ns_flush,
-  0, /* flush_display_optional */
  x_clear_window_mouse_face,
  x_get_glyph_overhangs,
  x_fix_overlapping_area,
@@ -4045,8 +4016,8 @@ ns_create_terminal (struct ns_display_info *dpyinfo)
  terminal->ins_del_lines_hook = 0; /* XXX vestigial? */
  terminal->delete_glyphs_hook = 0; /* XXX vestigial? */
  terminal->ring_bell_hook = ns_ring_bell;
-  terminal->reset_terminal_modes_hook = ns_reset_terminal_modes;
+  terminal->reset_terminal_modes_hook = NULL;
-  terminal->set_terminal_modes_hook = ns_set_terminal_modes;
+  terminal->set_terminal_modes_hook = NULL;
  terminal->update_begin_hook = ns_update_begin;
  terminal->update_end_hook = ns_update_end;
  terminal->set_terminal_window_hook = NULL; /* XXX vestigial? */
@@ -4686,7 +4657,7 @@ not_in_argv (NSString *arg)
  int waiting = 1, nfds;
  char c;
-  SELECT_TYPE readfds, writefds, *wfds;
+  fd_set readfds, writefds, *wfds;
  struct timespec timeout, *tmo;
  NSAutoreleasePool *pool = nil;
@@ -4699,7 +4670,7 @@ not_in_argv (NSString *arg)
      if (waiting)
        {
-          SELECT_TYPE fds;
+          fd_set fds;
          FD_ZERO (&fds);
          FD_SET (selfds[0], &fds);
          result = select (selfds[0]+1, &fds, NULL, NULL, NULL);
@@ -5468,6 +5439,30 @@ not_in_argv (NSString *arg)
  previous_help_echo_string = help_echo_string;
  help_echo_string = Qnil;
+  if (!NILP (Vmouse_autoselect_window))
+    {
+      NSTRACE (mouse_autoselect_window);
+      static Lisp_Object last_mouse_window;
+      Lisp_Object window = window_from_coordinates
+        (emacsframe, last_mouse_motion_position.x,
+         last_mouse_motion_position.y, 0, 0);
+      if (WINDOWP (window)
+          && !EQ (window, last_mouse_window)
+          && !EQ (window, selected_window)
+          && (focus_follows_mouse
+              || (EQ (XWINDOW (window)->frame,
+                      XWINDOW (selected_window)->frame))))
+        {
+          NSTRACE (in_window);
+          emacs_event->kind = SELECT_WINDOW_EVENT;
+          emacs_event->frame_or_window = window;
+          EV_TRAILER2 (e);
+        }
+      /* Remember the last window where we saw the mouse.  */
+      last_mouse_window = window;
+    }
  if (!note_mouse_movement (emacsframe, last_mouse_motion_position.x,
                            last_mouse_motion_position.y))
    help_echo_string = previous_help_echo_string;
diff --git a/src/print.c b/src/print.c
index e55657d7d8c..03e781cac18 100644
--- a/src/print.c
+++ b/src/print.c
@@ -126,7 +126,8 @@ bool print_output_debug_flag EXTERNALLY_VISIBLE = 1;
         set_buffer_internal (XMARKER (printcharfun)->buffer);          \
       marker_pos = marker_position (printcharfun);                     \
       if (marker_pos < BEGV || marker_pos > ZV)                        \
-         error ("Marker is outside the accessible part of the buffer"); \
+         signal_error ("Marker is outside the accessible "              \
+                       "part of the buffer", printcharfun);             \
       old_point = PT;                                                  \
       old_point_byte = PT_BYTE;                                        \
       SET_PT_BOTH (marker_pos,                                         \
@@ -138,10 +139,10 @@ bool print_output_debug_flag EXTERNALLY_VISIBLE = 1;
   if (NILP (printcharfun))                                             \
     {                                                                  \
       Lisp_Object string;                                              \
-       if (NILP (BVAR (current_buffer, enable_multibyte_characters))            \
+       if (NILP (BVAR (current_buffer, enable_multibyte_characters))    \
           && ! print_escape_multibyte)                                 \
         specbind (Qprint_escape_multibyte, Qt);                        \
-       if (! NILP (BVAR (current_buffer, enable_multibyte_characters))          \
+       if (! NILP (BVAR (current_buffer, enable_multibyte_characters))  \
           && ! print_escape_nonascii)                                  \
         specbind (Qprint_escape_nonascii, Qt);                         \
       if (print_buffer != 0)                                           \
@@ -168,7 +169,7 @@ bool print_output_debug_flag EXTERNALLY_VISIBLE = 1;
   if (NILP (printcharfun))                                             \
     {                                                                  \
       if (print_buffer_pos != print_buffer_pos_byte                    \
-           && NILP (BVAR (current_buffer, enable_multibyte_characters)))        \
+           && NILP (BVAR (current_buffer, enable_multibyte_characters)))\
         {                                                              \
           unsigned char *temp = alloca (print_buffer_pos + 1);         \
           copy_text ((unsigned char *) print_buffer, temp,             \
diff --git a/src/process.c b/src/process.c
index 3b62f45bf0a..20f84990d6f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -132,7 +132,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #ifdef WINDOWSNT
-extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
+extern int sys_select (int, fd_set *, fd_set *, fd_set *,
                       struct timespec *, void *);
 #endif
@@ -280,7 +280,7 @@ static bool process_output_skip;
 static void create_process (Lisp_Object, char **, Lisp_Object);
 #ifdef USABLE_SIGIO
-static bool keyboard_bit_set (SELECT_TYPE *);
+static bool keyboard_bit_set (fd_set *);
 #endif
 static void deactivate_process (Lisp_Object);
 static void status_notify (struct Lisp_Process *);
@@ -299,26 +299,26 @@ static void exec_sentinel (Lisp_Object proc, Lisp_Object reason);
 /* Mask of bits indicating the descriptors that we wait for input on.  */
-static SELECT_TYPE input_wait_mask;
+static fd_set input_wait_mask;
 /* Mask that excludes keyboard input descriptor(s).  */
-static SELECT_TYPE non_keyboard_wait_mask;
+static fd_set non_keyboard_wait_mask;
 /* Mask that excludes process input descriptor(s).  */
-static SELECT_TYPE non_process_wait_mask;
+static fd_set non_process_wait_mask;
 /* Mask for selecting for write.  */
-static SELECT_TYPE write_mask;
+static fd_set write_mask;
 #ifdef NON_BLOCKING_CONNECT
 /* Mask of bits indicating the descriptors that we wait for connect to
   complete on.  Once they complete, they are removed from this mask
   and added to the input_wait_mask and non_keyboard_wait_mask.  */
-static SELECT_TYPE connect_wait_mask;
+static fd_set connect_wait_mask;
 /* Number of bits set in connect_wait_mask.  */
 static int num_pending_connects;
@@ -331,7 +331,7 @@ static int max_process_desc;
 static int max_input_desc;
 /* Indexed by descriptor, gives the process (if any) for that descriptor */
-static Lisp_Object chan_process[MAXDESC];
+static Lisp_Object chan_process[FD_SETSIZE];
 /* Alist of elements (NAME . PROCESS) */
 static Lisp_Object Vprocess_alist;
@@ -342,18 +342,18 @@ static Lisp_Object Vprocess_alist;
   output from the process is to read at least one char.
   Always -1 on systems that support FIONREAD.  */
-static int proc_buffered_char[MAXDESC];
+static int proc_buffered_char[FD_SETSIZE];
 /* Table of `struct coding-system' for each process.  */
-static struct coding_system *proc_decode_coding_system[MAXDESC];
+static struct coding_system *proc_decode_coding_system[FD_SETSIZE];
-static struct coding_system *proc_encode_coding_system[MAXDESC];
+static struct coding_system *proc_encode_coding_system[FD_SETSIZE];
 #ifdef DATAGRAM_SOCKETS
 /* Table of `partner address' for datagram sockets.  */
 static struct sockaddr_and_len {
  struct sockaddr *sa;
  int len;
-} datagram_address[MAXDESC];
+} datagram_address[FD_SETSIZE];
 #define DATAGRAM_CHAN_P(chan)   (datagram_address[chan].sa != 0)
 #define DATAGRAM_CONN_P(proc)   (PROCESSP (proc) && datagram_address[XPROCESS (proc)->infd].sa != 0)
 #else
@@ -458,7 +458,7 @@ static struct fd_callback_data
 #define FOR_READ  1
 #define FOR_WRITE 2
  int condition; /* mask of the defines above.  */
-} fd_callback_info[MAXDESC];
+} fd_callback_info[FD_SETSIZE];
 /* Add a file descriptor FD to be monitored for when read is possible.
@@ -467,7 +467,7 @@ static struct fd_callback_data
 void
 add_read_fd (int fd, fd_callback func, void *data)
 {
-  eassert (fd < MAXDESC);
+  eassert (fd < FD_SETSIZE);
  add_keyboard_wait_descriptor (fd);
  fd_callback_info[fd].func = func;
@@ -480,7 +480,7 @@ add_read_fd (int fd, fd_callback func, void *data)
 void
 delete_read_fd (int fd)
 {
-  eassert (fd < MAXDESC);
+  eassert (fd < FD_SETSIZE);
  delete_keyboard_wait_descriptor (fd);
  fd_callback_info[fd].condition &= ~FOR_READ;
@@ -497,7 +497,7 @@ delete_read_fd (int fd)
 void
 add_write_fd (int fd, fd_callback func, void *data)
 {
-  eassert (fd < MAXDESC);
+  eassert (fd < FD_SETSIZE);
  FD_SET (fd, &write_mask);
  if (fd > max_input_desc)
    max_input_desc = fd;
@@ -528,7 +528,7 @@ delete_input_desc (int fd)
 void
 delete_write_fd (int fd)
 {
-  eassert (fd < MAXDESC);
+  eassert (fd < FD_SETSIZE);
  FD_CLR (fd, &write_mask);
  fd_callback_info[fd].condition &= ~FOR_WRITE;
  if (fd_callback_info[fd].condition == 0)
@@ -3232,7 +3232,7 @@ usage: (make-network-process &rest ARGS)  */)
             wait for completion is pselect(). */
          int sc;
          socklen_t len;
-          SELECT_TYPE fdset;
+          fd_set fdset;
        retry_select:
          FD_ZERO (&fdset);
          FD_SET (s, &fdset);
@@ -4232,8 +4232,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                             struct Lisp_Process *wait_proc, int just_wait_proc)
 {
  int channel, nfds;
-  SELECT_TYPE Available;
+  fd_set Available;
-  SELECT_TYPE Writeok;
+  fd_set Writeok;
  bool check_write;
  int check_delay;
  bool no_avail;
@@ -4387,8 +4387,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
         timeout to get our attention.  */
      if (update_tick != process_tick)
        {
-          SELECT_TYPE Atemp;
+          fd_set Atemp;
-          SELECT_TYPE Ctemp;
+          fd_set Ctemp;
          if (kbd_on_hold_p ())
            FD_ZERO (&Atemp);
@@ -4571,7 +4571,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                     the gnutls library -- 2.12.14 has been confirmed
                     to need it.  See
                     http://comments.gmane.org/gmane.emacs.devel/145074 */
-                  for (channel = 0; channel < MAXDESC; ++channel)
+                  for (channel = 0; channel < FD_SETSIZE; ++channel)
                    if (! NILP (chan_process[channel]))
                      {
                        struct Lisp_Process *p =
@@ -5178,15 +5178,10 @@ DEFUN ("internal-default-process-filter", Finternal_default_process_filter,
      bset_read_only (current_buffer, Qnil);
-      /* Insert new output into buffer
+      /* Insert new output into buffer at the current end-of-output
-         at the current end-of-output marker,
+         marker, thus preserving logical ordering of input and output.  */
-         thus preserving logical ordering of input and output.  */
      if (XMARKER (p->mark)->buffer)
-        SET_PT_BOTH (clip_to_bounds (BEGV,
+        set_point_from_marker (p->mark);
-                                     marker_position (p->mark), ZV),
-                     clip_to_bounds (BEGV_BYTE,
-                                     marker_byte_position (p->mark),
-                                     ZV_BYTE));
      else
        SET_PT_BOTH (ZV, ZV_BYTE);
      before = PT;
@@ -6542,7 +6537,7 @@ keyboard_bit_set (fd_set *mask)
 #else  /* not subprocesses */
 /* Defined on msdos.c.  */
-extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
+extern int sys_select (int, fd_set *, fd_set *, fd_set *,
                       struct timespec *, void *);
 /* Implementation of wait_reading_process_output, assuming that there
@@ -6608,7 +6603,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
  while (1)
    {
      bool timeout_reduced_for_timers = 0;
-      SELECT_TYPE waitchannels;
+      fd_set waitchannels;
      int xerrno;
      /* If calling from keyboard input, do not quit
@@ -7072,7 +7067,7 @@ init_process_emacs (void)
  Vprocess_alist = Qnil;
  deleted_pid_list = Qnil;
-  for (i = 0; i < MAXDESC; i++)
+  for (i = 0; i < FD_SETSIZE; i++)
    {
      chan_process[i] = Qnil;
      proc_buffered_char[i] = -1;
diff --git a/src/regex.c b/src/regex.c
index 2363fe2a290..1befececd22 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -257,15 +257,10 @@ xrealloc (void *block, size_t size)
 enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 };
 /* Dummy macros for non-Emacs environments.  */
-# define CHAR_CHARSET(c) 0
-# define CHARSET_LEADING_CODE_BASE(c) 0
 # define MAX_MULTIBYTE_LENGTH 1
 # define RE_MULTIBYTE_P(x) 0
 # define RE_TARGET_MULTIBYTE_P(x) 0
 # define WORD_BOUNDARY_P(c1, c2) (0)
-# define CHAR_HEAD_P(p) (1)
-# define SINGLE_BYTE_CHAR_P(c) (1)
-# define SAME_CHARSET_P(c1, c2) (1)
 # define BYTES_BY_CHAR_HEAD(p) (1)
 # define PREV_CHAR_BOUNDARY(p, limit) ((p)--)
 # define STRING_CHAR(p) (*(p))
@@ -279,8 +274,6 @@ enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 };
  (c = ((p) == (str2) ? *((end1) - 1) : *((p) - 1)))
 # define GET_CHAR_AFTER(c, p, len)      \
  (c = *p, len = 1)
-# define MAKE_CHAR(charset, c1, c2) (c1)
-# define BYTE8_TO_CHAR(c) (c)
 # define CHAR_BYTE8_P(c) (0)
 # define CHAR_LEADING_CODE(c) (c)
@@ -775,10 +768,12 @@ extract_number_and_incr (re_char **source)
   and the 2 bytes of flags at the start of the range table.  */
 #define CHARSET_RANGE_TABLE(p) (&(p)[4 + CHARSET_BITMAP_SIZE (p)])
+#ifdef emacs
 /* Extract the bit flags that start a range table.  */
 #define CHARSET_RANGE_TABLE_BITS(p)             \
  ((p)[2 + CHARSET_BITMAP_SIZE (p)]             \
   + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100)
+#endif
 /* Return the address of end of RANGE_TABLE.  COUNT is number of
   ranges (which is a pair of (start, end)) in the RANGE_TABLE.  `* 2'
@@ -1830,6 +1825,8 @@ struct range_table_work_area
  int bits;                     /* flag to record character classes */
 };
+#ifdef emacs
 /* Make sure that WORK_AREA can hold more N multibyte characters.
   This is used only in set_image_of_range and set_image_of_range_1.
   It expects WORK_AREA to be a pointer.
@@ -1848,15 +1845,6 @@ struct range_table_work_area
 #define SET_RANGE_TABLE_WORK_AREA_BIT(work_area, bit)           \
  (work_area).bits |= (bit)
-/* Bits used to implement the multibyte-part of the various character classes
-   such as [:alnum:] in a charset's range table.  */
-#define BIT_WORD        0x1
-#define BIT_LOWER       0x2
-#define BIT_PUNCT       0x4
-#define BIT_SPACE       0x8
-#define BIT_UPPER       0x10
-#define BIT_MULTIBYTE   0x20
 /* Set a range (RANGE_START, RANGE_END) to WORK_AREA.  */
 #define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end)    \
  do {                                                                  \
@@ -1865,6 +1853,8 @@ struct range_table_work_area
    (work_area).table[(work_area).used++] = (range_end);                \
  } while (0)
+#endif /* emacs */
 /* Free allocated memory for WORK_AREA.  */
 #define FREE_RANGE_TABLE_WORK_AREA(work_area)   \
  do {                                          \
@@ -1876,6 +1866,15 @@ struct range_table_work_area
 #define RANGE_TABLE_WORK_USED(work_area) ((work_area).used)
 #define RANGE_TABLE_WORK_BITS(work_area) ((work_area).bits)
 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i])
+/* Bits used to implement the multibyte-part of the various character classes
+   such as [:alnum:] in a charset's range table.  */
+#define BIT_WORD        0x1
+#define BIT_LOWER       0x2
+#define BIT_PUNCT       0x4
+#define BIT_SPACE       0x8
+#define BIT_UPPER       0x10
+#define BIT_MULTIBYTE   0x20
 /* Set the bit for character C in a list.  */
diff --git a/src/search.c b/src/search.c
index 761c12a364a..99e8d2501fe 100644
--- a/src/search.c
+++ b/src/search.c
@@ -859,88 +859,20 @@ find_newline (ptrdiff_t start, ptrdiff_t start_byte, ptrdiff_t end,
   If ALLOW_QUIT, set immediate_quit.  That's good to do
   except in special cases.  */
-EMACS_INT
+ptrdiff_t
 scan_newline (ptrdiff_t start, ptrdiff_t start_byte,
              ptrdiff_t limit, ptrdiff_t limit_byte,
-              EMACS_INT count, bool allow_quit)
+              ptrdiff_t count, bool allow_quit)
 {
-  int direction = ((count > 0) ? 1 : -1);
+  ptrdiff_t charpos, bytepos, shortage;
-  unsigned char *cursor;
-  unsigned char *base;
-  ptrdiff_t ceiling;
-  unsigned char *ceiling_addr;
-  bool old_immediate_quit = immediate_quit;
-  if (allow_quit)
-    immediate_quit++;
-  if (count > 0)
+  charpos = find_newline (start, start_byte, limit, limit_byte,
-    {
+                          count, &shortage, &bytepos, allow_quit);
-      while (start_byte < limit_byte)
+  if (shortage)
-        {
+    TEMP_SET_PT_BOTH (limit, limit_byte);
-          ceiling =  BUFFER_CEILING_OF (start_byte);
-          ceiling = min (limit_byte - 1, ceiling);
-          ceiling_addr = BYTE_POS_ADDR (ceiling) + 1;
-          base = (cursor = BYTE_POS_ADDR (start_byte));
-          do
-            {
-              unsigned char *nl = memchr (cursor, '\n', ceiling_addr - cursor);
-              if (! nl)
-                break;
-              if (--count == 0)
-                {
-                  immediate_quit = old_immediate_quit;
-                  start_byte += nl - base + 1;
-                  start = BYTE_TO_CHAR (start_byte);
-                  TEMP_SET_PT_BOTH (start, start_byte);
-                  return 0;
-                }
-              cursor = nl + 1;
-            }
-          while (cursor < ceiling_addr);
-          start_byte += ceiling_addr - base;
-        }
-    }
  else
-    {
+    TEMP_SET_PT_BOTH (charpos, bytepos);
-      while (start_byte > limit_byte)
+  return shortage;
-        {
-          ceiling = BUFFER_FLOOR_OF (start_byte - 1);
-          ceiling = max (limit_byte, ceiling);
-          ceiling_addr = BYTE_POS_ADDR (ceiling);
-          base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1);
-          while (1)
-            {
-              unsigned char *nl = memrchr (ceiling_addr, '\n',
-                                           cursor - ceiling_addr);
-              if (! nl)
-                break;
-              if (++count == 0)
-                {
-                  immediate_quit = old_immediate_quit;
-                  /* Return the position AFTER the match we found.  */
-                  start_byte += nl - base + 1;
-                  start = BYTE_TO_CHAR (start_byte);
-                  TEMP_SET_PT_BOTH (start, start_byte);
-                  return 0;
-                }
-              cursor = nl;
-            }
-          start_byte += ceiling_addr - base;
-        }
-    }
-  TEMP_SET_PT_BOTH (limit, limit_byte);
-  immediate_quit = old_immediate_quit;
-  return count * direction;
 }
 /* Like find_newline, but doesn't allow QUITting and doesn't return
diff --git a/src/sysdep.c b/src/sysdep.c
index e43991f41ab..6439697501e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -588,7 +588,7 @@ restore_signal_handlers (struct save_signal *saved_handlers)
 }
 #ifdef USABLE_SIGIO
-static int old_fcntl_flags[MAXDESC];
+static int old_fcntl_flags[FD_SETSIZE];
 #endif
 void
@@ -817,7 +817,7 @@ emacs_set_tty (int fd, struct emacs_tty *settings, bool flushp)
 #ifdef F_SETOWN
-static int old_fcntl_owner[MAXDESC];
+static int old_fcntl_owner[FD_SETSIZE];
 #endif /* F_SETOWN */
 /* This may also be defined in stdio,
diff --git a/src/sysselect.h b/src/sysselect.h
index 0a4f7e3ad96..5df0af9ed37 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -25,15 +25,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   definitions in w32.h are incompatible with the below.  */
 #ifndef WINDOWSNT
 #ifdef FD_SET
-#ifdef FD_SETSIZE
+#ifndef FD_SETSIZE
-#define MAXDESC FD_SETSIZE
+#define FD_SETSIZE 64
-#else
-#define MAXDESC 64
 #endif
-#define SELECT_TYPE fd_set
 #else /* no FD_SET */
-#define MAXDESC 32
+#define FD_SETSIZE 32
-#define SELECT_TYPE int
+typedef int fd_set;
 /* Define the macros to access a single-int bitmap of descriptors.  */
 #define FD_SET(n, p) (*(p) |= (1 << (n)))
diff --git a/src/term.c b/src/term.c
index aa61fde06ee..0270c1eefa6 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1800,27 +1800,10 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str)
 static void
 produce_glyphless_glyph (struct it *it, Lisp_Object acronym)
 {
-  int face_id;
+  int len, face_id = merge_glyphless_glyph_face (it);
-  int len;
  char buf[sizeof "\\x" + max (6, (sizeof it->c * CHAR_BIT + 3) / 4)];
  char const *str = "    ";
-  /* Get a face ID for the glyph by utilizing a cache (the same way as
-     done for `escape-glyph' in get_next_display_element).  */
-  if (it->f == last_glyphless_glyph_frame
-      && it->face_id == last_glyphless_glyph_face_id)
-    {
-      face_id = last_glyphless_glyph_merged_face_id;
-    }
-  else
-    {
-      /* Merge the `glyphless-char' face into the current face.  */
-      face_id = merge_faces (it->f, Qglyphless_char, 0, it->face_id);
-      last_glyphless_glyph_frame = it->f;
-      last_glyphless_glyph_face_id = it->face_id;
-      last_glyphless_glyph_merged_face_id = face_id;
-    }
  if (it->glyphless_method == GLYPHLESS_DISPLAY_THIN_SPACE)
    {
      /* As there's no way to produce a thin space, we produce a space
diff --git a/src/termhooks.h b/src/termhooks.h
index b22367b6751..e47d9701229 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -18,7 +18,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+#ifndef EMACS_TERMHOOKS_H
+#define EMACS_TERMHOOKS_H
 /* Miscellanea.   */
 #include "systime.h" /* for Time */
@@ -28,10 +30,6 @@ INLINE_HEADER_BEGIN
 # define TERMHOOKS_INLINE INLINE
 #endif
-struct glyph;
-struct frame;
 enum scroll_bar_part {
  scroll_bar_above_handle,
  scroll_bar_handle,
@@ -49,7 +47,18 @@ enum scroll_bar_part {
   may do something OS dependent, like extended window manager hints on X11.  */
 extern void (*fullscreen_hook) (struct frame *f);
+/* Output method of a terminal (and frames on this terminal, respectively).  */
+enum output_method
+{
+  output_initial,
+  output_termcap,
+  output_x_window,
+  output_msdos_raw,
+  output_w32,
+  output_ns
+};
 /* Input queue declarations and hooks.  */
 enum event_kind
@@ -324,11 +333,6 @@ extern void term_mouse_moveto (int, int);
 extern struct tty_display_info *gpm_tty;
 #endif
-struct ns_display_info;
-struct x_display_info;
-struct w32_display_info;
 /* Terminal-local parameters. */
 struct terminal
 {
@@ -663,3 +667,5 @@ extern void close_gpm (int gpm_fd);
 #endif
 INLINE_HEADER_END
+#endif /* EMACS_TERMHOOKS_H */
diff --git a/src/w32.c b/src/w32.c
index 05a3fde97ce..1dcf46b5f4b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -6092,6 +6092,7 @@ term_winsock (void)
 {
  if (winsock_lib != NULL && winsock_inuse == 0)
    {
+      release_listen_threads ();
      /* Not sure what would cause WSAENETDOWN, or even if it can happen
         after WSAStartup returns successfully, but it seems reasonable
         to allow unloading winsock anyway in that case. */
@@ -7076,7 +7077,12 @@ _sys_wait_accept (int fd)
  rc = pfn_WSAEventSelect (SOCK_HANDLE (fd), hEv, FD_ACCEPT);
  if (rc != SOCKET_ERROR)
    {
-      rc = WaitForSingleObject (hEv, INFINITE);
+      do {
+        rc = WaitForSingleObject (hEv, 500);
+        Sleep (5);
+      } while (rc == WAIT_TIMEOUT
+               && cp->status != STATUS_READ_ERROR
+               && cp->char_avail);
      pfn_WSAEventSelect (SOCK_HANDLE (fd), NULL, 0);
      if (rc == WAIT_OBJECT_0)
        cp->status = STATUS_READ_SUCCEEDED;
diff --git a/src/w32.h b/src/w32.h
index 9c1f1efa699..32d0fdbe3cf 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -163,6 +163,7 @@ extern void reset_standard_handles (int in, int out,
 /* Return the string resource associated with KEY of type TYPE.  */
 extern LPBYTE w32_get_resource (char * key, LPDWORD type);
+extern void release_listen_threads (void);
 extern void init_ntproc (int);
 extern void term_ntproc (int);
 extern void globals_of_w32 (void);
diff --git a/src/w32console.c b/src/w32console.c
index a707344efc8..8da1ccf1892 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -53,7 +53,6 @@ static void w32con_write_glyphs (struct frame *f, struct glyph *string, int len)
 static void w32con_delete_glyphs (struct frame *f, int n);
 static void w32con_reset_terminal_modes (struct terminal *t);
 static void w32con_set_terminal_modes (struct terminal *t);
-static void w32con_set_terminal_window (struct frame *f, int size);
 static void w32con_update_begin (struct frame * f);
 static void w32con_update_end (struct frame * f);
 static WORD w32_face_attributes (struct frame *f, int face_id);
@@ -497,11 +496,6 @@ w32con_update_end (struct frame * f)
  SetConsoleCursorPosition (cur_screen, cursor_coords);
 }
-static void
-w32con_set_terminal_window (struct frame *f, int size)
-{
-}
 /***********************************************************************
                        stubs from termcap.c
 ***********************************************************************/
@@ -619,7 +613,7 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
  term->ring_bell_hook          = w32_sys_ring_bell;
  term->reset_terminal_modes_hook = w32con_reset_terminal_modes;
  term->set_terminal_modes_hook = w32con_set_terminal_modes;
-  term->set_terminal_window_hook = w32con_set_terminal_window;
+  term->set_terminal_window_hook = NULL;
  term->update_begin_hook       = w32con_update_begin;
  term->update_end_hook         = w32con_update_end;
diff --git a/src/w32fns.c b/src/w32fns.c
index b8c445a3a36..58c63d959ef 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1637,7 +1637,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
      x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
      do_pending_window_change (0);
    }
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
 }
@@ -1679,7 +1679,7 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
  FRAME_TOOL_BAR_LINES (f) = nlines;
  resize_frame_windows (f, FRAME_LINES (f), 0);
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  /* We also have to make sure that the internal border at the top of
     the frame, below the menu bar or tool bar, is redrawn when the
@@ -6059,7 +6059,7 @@ Text larger than the specified size is clipped.  */)
    }
  FRAME_TOTAL_COLS (f) = WINDOW_TOTAL_COLS (w);
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  w->pseudo_window_p = 1;
  /* Display the tooltip text in a temporary buffer.  */
@@ -6128,7 +6128,7 @@ Text larger than the specified size is clipped.  */)
      width /= WINDOW_FRAME_COLUMN_WIDTH (w);
      w->total_cols = width;
      FRAME_TOTAL_COLS (f) = width;
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      w->pseudo_window_p = 1;
      clear_glyph_matrix (w->desired_matrix);
      clear_glyph_matrix (w->current_matrix);
diff --git a/src/w32proc.c b/src/w32proc.c
index 54316a6f80f..dabaa62f71c 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -990,6 +990,18 @@ find_child_pid (DWORD pid)
  return NULL;
 }
+void
+release_listen_threads (void)
+{
+  int i;
+  for (i = child_proc_count - 1; i >= 0; i--)
+    {
+      if (CHILD_ACTIVE (&child_procs[i])
+          && (fd_info[child_procs[i].fd].flags & FILE_LISTEN))
+        child_procs[i].status = STATUS_READ_ERROR;
+    }
+}
 /* Thread proc for child process and socket reader threads. Each thread
   is normally blocked until woken by select() to check for input by
diff --git a/src/w32term.c b/src/w32term.c
index ba3aadd0b49..681f70b5888 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -84,9 +84,6 @@ static int last_mousemove_y = 0;
 static int any_help_event_p;
-/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
-static Lisp_Object last_window;
 extern unsigned int msh_mousewheel;
 extern void free_frame_menubar (struct frame *);
@@ -224,8 +221,6 @@ void x_wm_set_icon_pixmap (struct frame *, int);
 static void w32_initialize (void);
 static void x_update_end (struct frame *);
 static void w32_frame_up_to_date (struct frame *);
-static void w32_set_terminal_modes (struct terminal *);
-static void w32_reset_terminal_modes (struct terminal *);
 static void x_clear_frame (struct frame *);
 static void frame_highlight (struct frame *);
 static void frame_unhighlight (struct frame *);
@@ -240,7 +235,8 @@ static void x_frame_rehighlight (struct w32_display_info *);
 static void x_draw_hollow_cursor (struct window *, struct glyph_row *);
 static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
                               enum text_cursor_kinds);
-static void w32_clip_to_row (struct window *, struct glyph_row *, int, HDC);
+static void w32_clip_to_row (struct window *, struct glyph_row *,
+                             enum glyph_row_area, HDC);
 static BOOL my_show_window (struct frame *, HWND, int);
 static void my_set_window_pos (HWND, HWND, int, int, int, int, UINT);
 #if 0
@@ -576,8 +572,7 @@ x_update_begin (struct frame *f)
 }
-/* Start update of window W.  Set output_cursor to the cursor
+/* Start update of window W.  */
-   position of W.  */
 static void
 x_update_window_begin (struct window *w)
@@ -591,7 +586,7 @@ x_update_window_begin (struct window *w)
      SendMessage (w32_system_caret_hwnd, WM_EMACS_HIDE_CARET, 0, 0);
    }
-  set_output_cursor (&w->cursor);
+  w->output_cursor = w->cursor;
  block_input ();
@@ -683,9 +678,9 @@ x_update_window_end (struct window *w, bool cursor_on_p,
      block_input ();
      if (cursor_on_p)
-        display_and_set_cursor (w, 1, output_cursor.hpos,
+        display_and_set_cursor (w, 1,
-                                output_cursor.vpos,
+                                w->output_cursor.hpos, w->output_cursor.vpos,
-                                output_cursor.x, output_cursor.y);
+                                w->output_cursor.x, w->output_cursor.y);
      if (draw_window_fringes (w, 1))
        x_draw_vertical_border (w);
@@ -849,7 +844,7 @@ w32_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
    }
  /* Must clip because of partially visible lines.  */
-  w32_clip_to_row (w, row, -1, hdc);
+  w32_clip_to_row (w, row, ANY_AREA, hdc);
  if (p->which && p->which < max_fringe_bmp)
    {
@@ -934,28 +929,6 @@ w32_destroy_fringe_bitmap (int which)
  fringe_bmp[which] = 0;
 }
-/* This is called when starting Emacs and when restarting after
-   suspend.  When starting Emacs, no window is mapped.  And nothing
-   must be done to Emacs's own window if it is suspended (though that
-   rarely happens).  */
-static void
-w32_set_terminal_modes (struct terminal *term)
-{
-}
-/* This is called when exiting or suspending Emacs.  Exiting will make
-   the W32 windows go away, and suspending requires no action. */
-static void
-w32_reset_terminal_modes (struct terminal *term)
-{
-}
 /***********************************************************************
                           Display Iterator
 ***********************************************************************/
@@ -2651,11 +2624,7 @@ x_clear_frame (struct frame *f)
  /* Clearing the frame will erase any cursor, so mark them all as no
     longer visible.  */
  mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f)));
-  output_cursor.hpos = output_cursor.vpos = 0;
-  output_cursor.x = -1;
-  /* We don't set the output cursor here because there will always
-     follow an explicit cursor_to.  */
  block_input ();
  w32_clear_window (f);
@@ -2693,19 +2662,6 @@ w32_ring_bell (struct frame *f)
  unblock_input ();
 }
-/* Specify how many text lines, from the top of the window,
-   should be affected by insert-lines and delete-lines operations.
-   This, and those operations, are used only within an update
-   that is bounded by calls to x_update_begin and x_update_end.  */
-static void
-w32_set_terminal_window (struct frame *f, int n)
-{
-  /* This function intentionally left blank.  */
-}
 /***********************************************************************
                              Line Dance
 ***********************************************************************/
@@ -2736,7 +2692,7 @@ x_scroll_run (struct window *w, struct run *run)
  /* Get frame-relative bounding box of the text display area of W,
     without mode lines.  Include in this box the left and right
     fringes of W.  */
-  window_box (w, -1, &x, &y, &width, &height);
+  window_box (w, ANY_AREA, &x, &y, &width, &height);
  /* If the fringe is adjacent to the left (right) scroll bar of a
     leftmost (rightmost, respectively) window, then extend its
@@ -3830,7 +3786,7 @@ w32_set_vertical_scroll_bar (struct window *w,
  bool fringe_extended_p;
  /* Get window dimensions.  */
-  window_box (w, -1, 0, &window_y, 0, &window_height);
+  window_box (w, ANY_AREA, 0, &window_y, 0, &window_height);
  top  = window_y;
  width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f);
  height = window_height;
@@ -4544,18 +4500,16 @@ w32_read_socket (struct terminal *terminal,
              /* Generate SELECT_WINDOW_EVENTs when needed.  */
              if (!NILP (Vmouse_autoselect_window))
                {
-                  Lisp_Object window;
+                  static Lisp_Object last_mouse_window;
-                  int x = LOWORD (msg.msg.lParam);
+                  Lisp_Object window = window_from_coordinates
-                  int y = HIWORD (msg.msg.lParam);
+                    (f, LOWORD (msg.msg.lParam), HIWORD (msg.msg.lParam), 0, 0);
-                  window = window_from_coordinates (f, x, y, 0, 0);
                  /* Window will be selected only when it is not
                     selected now and last mouse movement event was
                     not in it.  Minibuffer window will be selected
                     only when it is active.  */
                  if (WINDOWP (window)
-                      && !EQ (window, last_window)
+                      && !EQ (window, last_mouse_window)
                      && !EQ (window, selected_window)
                      /* For click-to-focus window managers
                         create event iff we don't leave the
@@ -4567,8 +4521,8 @@ w32_read_socket (struct terminal *terminal,
                      inev.kind = SELECT_WINDOW_EVENT;
                      inev.frame_or_window = window;
                    }
+                  /* Remember the last window where we saw the mouse.  */
-                  last_window = window;
+                  last_mouse_window = window;
                }
              if (!note_mouse_movement (f, &msg.msg))
                help_echo_string = previous_help_echo_string;
@@ -5123,7 +5077,8 @@ w32_read_socket (struct terminal *terminal,
   mode lines must be clipped to the whole window.  */
 static void
-w32_clip_to_row (struct window *w, struct glyph_row *row, int area, HDC hdc)
+w32_clip_to_row (struct window *w, struct glyph_row *row,
+                 enum glyph_row_area area, HDC hdc)
 {
  RECT clip_rect;
  int window_x, window_y, window_width;
@@ -6303,11 +6258,6 @@ w32_make_rdb (char *xrm_option)
  return buffer;
 }
-void
-x_flush (struct frame * f)
-{ /* Nothing to do */ }
 extern frame_parm_handler w32_frame_parm_handlers[];
 static struct redisplay_interface w32_redisplay_interface =
@@ -6321,9 +6271,7 @@ static struct redisplay_interface w32_redisplay_interface =
  x_after_update_window_line,
  x_update_window_begin,
  x_update_window_end,
-  x_cursor_to,
+  0, /* flush_display */
-  x_flush,
-  0,  /* flush_display_optional */
  x_clear_window_mouse_face,
  x_get_glyph_overhangs,
  x_fix_overlapping_area,
@@ -6358,11 +6306,11 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
  terminal->ins_del_lines_hook = x_ins_del_lines;
  terminal->delete_glyphs_hook = x_delete_glyphs;
  terminal->ring_bell_hook = w32_ring_bell;
-  terminal->reset_terminal_modes_hook = w32_reset_terminal_modes;
+  terminal->reset_terminal_modes_hook = NULL;
-  terminal->set_terminal_modes_hook = w32_set_terminal_modes;
+  terminal->set_terminal_modes_hook = NULL;
  terminal->update_begin_hook = x_update_begin;
  terminal->update_end_hook = x_update_end;
-  terminal->set_terminal_window_hook = w32_set_terminal_window;
+  terminal->set_terminal_window_hook = NULL;
  terminal->read_socket_hook = w32_read_socket;
  terminal->frame_up_to_date_hook = w32_frame_up_to_date;
  terminal->mouse_position_hook = w32_mouse_position;
diff --git a/src/w32term.h b/src/w32term.h
index 41c5c71832a..b4818f69aee 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -211,7 +211,6 @@ extern void x_set_window_size (struct frame *f, int change_grav,
                              int cols, int rows);
 extern int x_display_pixel_height (struct w32_display_info *);
 extern int x_display_pixel_width (struct w32_display_info *);
-extern void x_sync (struct frame *);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 extern void x_set_mouse_position (struct frame *f, int h, int v);
 extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 19c6b72bf89..7629e49caf8 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -333,9 +333,3 @@ drain_message_queue (void)
    }
  return retval;
 }
-/* x_sync is a no-op on W32.  */
-void
-x_sync (struct frame *f)
-{
-}
diff --git a/src/window.c b/src/window.c
index 1331ac014ff..410015e472e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -39,13 +39,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "intervals.h"
 #include "termhooks.h"          /* For FRAME_TERMINAL.  */
+#ifdef HAVE_WINDOW_SYSTEM
-#ifdef HAVE_X_WINDOWS
+#include TERM_HEADER
-#include "xterm.h"
+#endif /* HAVE_WINDOW_SYSTEM */
-#endif  /* HAVE_X_WINDOWS */
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
 #ifdef MSDOS
 #include "msdos.h"
 #endif
@@ -552,15 +548,7 @@ select_window_1 (Lisp_Object window, bool inhibit_point_swap)
     than one window.  It also matters when
     redisplay_window has altered point after scrolling,
     because it makes the change only in the window.  */
-  {
+  set_point_from_marker (XWINDOW (window)->pointm);
-    register ptrdiff_t new_point = marker_position (XWINDOW (window)->pointm);
-    if (new_point < BEGV)
-      SET_PT (BEGV);
-    else if (new_point > ZV)
-      SET_PT (ZV);
-    else
-      SET_PT (new_point);
-  }
 }
 DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
@@ -1505,7 +1493,6 @@ if it isn't already recorded.  */)
      && !noninteractive)
    {
      struct text_pos startp;
-      ptrdiff_t charpos = marker_position (w->start);
      struct it it;
      struct buffer *old_buffer = NULL;
      void *itdata = NULL;
@@ -1523,12 +1510,7 @@ if it isn't already recorded.  */)
         `-l' containing a call to `rmail' with subsequent other
         commands.  At the end, W->start happened to be BEG, while
         rmail had already narrowed the buffer.  */
-      if (charpos < BEGV)
+      CLIP_TEXT_POS_FROM_MARKER (startp, w->start);
-        SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
-      else if (charpos > ZV)
-        SET_TEXT_POS (startp, ZV, ZV_BYTE);
-      else
-        SET_TEXT_POS_FROM_MARKER (startp, w->start);
      itdata = bidi_shelve_cache ();
      start_display (&it, w, startp);
@@ -2969,7 +2951,7 @@ window-start value is reasonable when this function is called.  */)
        }
    }
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  unblock_input ();
  run_window_configuration_change_hook (f);
@@ -3352,10 +3334,8 @@ temp_output_buffer_show (register Lisp_Object buf)
  if (!NILP (Vtemp_buffer_show_function))
    call1 (Vtemp_buffer_show_function, buf);
-  else
+  else if (WINDOW_LIVE_P (window = display_buffer (buf, Qnil, Qnil)))
    {
-      window = display_buffer (buf, Qnil, Qnil);
      if (!EQ (XWINDOW (window)->frame, selected_frame))
        Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
      Vminibuf_scroll_window = window;
@@ -3445,6 +3425,7 @@ make_window (void)
     non-Lisp data, so do it only for slots which should not be zero.  */
  w->nrows_scale_factor = w->ncols_scale_factor = 1;
  w->left_fringe_width = w->right_fringe_width = -1;
+  w->mode_line_height = w->header_line_height = -1;
  w->phys_cursor_type = -1;
  w->phys_cursor_width = -1;
  w->scroll_bar_width = -1;
@@ -3670,7 +3651,7 @@ be applied on the Elisp level.  */)
  windows_or_buffers_changed++;
  FRAME_WINDOW_SIZES_CHANGED (f) = 1;
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  unblock_input ();
  run_window_configuration_change_hook (f);
@@ -3940,7 +3921,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
  block_input ();
  window_resize_apply (p, horflag);
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  /* Set buffer of NEW to buffer of reference window.  Don't run
     any hooks.  */
  set_window_buffer (new, r->contents, 0, 1);
@@ -4072,7 +4053,7 @@ Signal an error when WINDOW is the only window on its frame.  */)
          recombine_windows (sibling);
        }
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      if (!WINDOW_LIVE_P (FRAME_SELECTED_WINDOW (f)))
        /* We deleted the frame's selected window.  */
@@ -4159,7 +4140,7 @@ grow_mini_window (struct window *w, int delta)
      w->total_lines -= XINT (value);
      /* Enforce full redisplay.  FIXME: make it more selective.  */
      windows_or_buffers_changed++;
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      unblock_input ();
    }
 }
@@ -4193,7 +4174,7 @@ shrink_mini_window (struct window *w)
          w->total_lines = 1;
          /* Enforce full redisplay.  FIXME: make it more selective.  */
          windows_or_buffers_changed++;
-          adjust_glyphs (f);
+          adjust_frame_glyphs (f);
          unblock_input ();
        }
      /* If the above failed for whatever strange reason we must make a
@@ -4234,7 +4215,7 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
      windows_or_buffers_changed++;
      FRAME_WINDOW_SIZES_CHANGED (f) = 1;
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      unblock_input ();
      run_window_configuration_change_hook (f);
@@ -4505,7 +4486,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
                 visible.  */
              w->vscroll = (it.last_visible_y
                            - it.current_y + it.max_ascent + it.max_descent);
-              adjust_glyphs (it.f);
+              adjust_frame_glyphs (it.f);
            }
          else
            {
@@ -5054,7 +5035,6 @@ displayed_window_lines (struct window *w)
 {
  struct it it;
  struct text_pos start;
-  ptrdiff_t charpos = marker_position (w->start);
  int height = window_box_height (w);
  struct buffer *old_buffer;
  int bottom_y;
@@ -5071,12 +5051,7 @@ displayed_window_lines (struct window *w)
  /* In case W->start is out of the accessible range, do something
     reasonable.  This happens in Info mode when Info-scroll-down
     calls (recenter -1) while W->start is 1.  */
-  if (charpos < BEGV)
+  CLIP_TEXT_POS_FROM_MARKER (start, w->start);
-    SET_TEXT_POS (start, BEGV, BEGV_BYTE);
-  else if (charpos > ZV)
-    SET_TEXT_POS (start, ZV, ZV_BYTE);
-  else
-    SET_TEXT_POS_FROM_MARKER (start, w->start);
  itdata = bidi_shelve_cache ();
  start_display (&it, w, start);
@@ -5788,7 +5763,7 @@ the return value is nil.  Otherwise the value is t.  */)
            ++n;
        }
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      unblock_input ();
      /* Scan dead buffer windows.  */
@@ -6117,7 +6092,7 @@ apply_window_adjustment (struct window *w)
  clear_glyph_matrix (w->current_matrix);
  w->window_end_valid = 0;
  windows_or_buffers_changed++;
-  adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
+  adjust_frame_glyphs (XFRAME (WINDOW_FRAME (w)));
 }
@@ -6383,7 +6358,7 @@ If PIXELS-P is non-nil, the return value is VSCROLL.  */)
          /* Adjust glyph matrix of the frame if the virtual display
             area becomes larger than before.  */
          if (w->vscroll < 0 && w->vscroll < old_dy)
-            adjust_glyphs (f);
+            adjust_frame_glyphs (f);
          /* Prevent redisplay shortcuts.  */
          XBUFFER (w->contents)->prevent_redisplay_optimizations_p = 1;
diff --git a/src/window.h b/src/window.h
index de77dcabc85..f5ae81149b3 100644
--- a/src/window.h
+++ b/src/window.h
@@ -236,6 +236,9 @@ struct window
    /* Where the cursor actually is.  */
    struct cursor_pos phys_cursor;
+    /* Internally used for redisplay purposes.  */
+    struct cursor_pos output_cursor;
    /* Vertical cursor position as of last update that completed
       without pause.  This is the position of last_point.  */
    int last_cursor_vpos;
@@ -261,6 +264,12 @@ struct window
       A value of -1 means use frame values.  */
    int scroll_bar_width;
+    /* Effective height of the mode line, or -1 if not known.  */
+    int mode_line_height;
+    /* Effective height of the header line, or -1 if not known.  */
+    int header_line_height;
    /* Z - the buffer position of the last glyph in the current
       matrix of W.  Only valid if window_end_valid is nonzero.  */
    ptrdiff_t window_end_pos;
@@ -856,14 +865,6 @@ extern Lisp_Object minibuf_window;
 extern Lisp_Object minibuf_selected_window;
-/* Window that the mouse is over (nil if no mouse support).  */
-extern Lisp_Object Vmouse_window;
-/* Last mouse-click event (nil if no mouse support).  */
-extern Lisp_Object Vmouse_event;
 extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
                                            enum window_part *, bool);
@@ -956,6 +957,22 @@ extern void init_window (void);
 extern void syms_of_window (void);
 extern void keys_of_window (void);
+/* Move cursor to row/column position VPOS/HPOS, pixel coordinates
+   Y/X. HPOS/VPOS are window-relative row and column numbers and X/Y
+   are window-relative pixel positions.  This is always done during
+   window update, so the position is the future output cursor position
+   for currently updated window W.  */
+WINDOW_INLINE void
+output_cursor_to (struct window *w, int vpos, int hpos, int y, int x)
+{
+  eassert (w);
+  w->output_cursor.hpos = hpos;
+  w->output_cursor.vpos = vpos;
+  w->output_cursor.x = x;
+  w->output_cursor.y = y;
+}
 INLINE_HEADER_END
 #endif /* not WINDOW_H_INCLUDED */
diff --git a/src/xdisp.c b/src/xdisp.c
index e3a6eca387f..b9a16ffcc43 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -299,19 +299,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "font.h"
 #include "fontset.h"
 #include "blockinput.h"
+#ifdef HAVE_WINDOW_SYSTEM
-#ifdef HAVE_X_WINDOWS
+#include TERM_HEADER
-#include "xterm.h"
+#endif /* HAVE_WINDOW_SYSTEM */
-#endif
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
-#ifdef USE_GTK
-#include "gtkutil.h"
-#endif
 #include "font.h"
 #ifdef HAVE_XWIDGETS
@@ -526,10 +516,6 @@ int update_mode_lines;
 int windows_or_buffers_changed;
-/* Nonzero means a frame's cursor type has been changed.  */
-static int cursor_type_changed;
 /* Nonzero after display_mode_line if %l was used and it displayed a
   line number.  */
@@ -587,12 +573,6 @@ static int last_height;
 int help_echo_showing_p;
-/* If >= 0, computed, exact values of mode-line and header-line height
-   to use in the macros CURRENT_MODE_LINE_HEIGHT and
-   CURRENT_HEADER_LINE_HEIGHT.  */
-int current_mode_line_height, current_header_line_height;
 /* The maximum distance to look ahead for text properties.  Values
   that are too small let us call compute_char_face and similar
   functions too often which is expensive.  Values that are too large
@@ -764,6 +744,8 @@ Lisp_Object previous_help_echo_string;
 /* Platform-independent portion of hourglass implementation. */
+#ifdef HAVE_WINDOW_SYSTEM
 /* Non-zero means an hourglass cursor is currently shown.  */
 int hourglass_shown_p;
@@ -771,6 +753,8 @@ int hourglass_shown_p;
   an hourglass cursor on all frames.  */
 struct atimer *hourglass_atimer;
+#endif /* HAVE_WINDOW_SYSTEM */
 /* Name of the face used to display glyphless characters.  */
 Lisp_Object Qglyphless_char;
@@ -780,14 +764,17 @@ static Lisp_Object Qglyphless_char_display;
 /* Method symbols for Vglyphless_char_display.  */
 static Lisp_Object Qhex_code, Qempty_box, Qthin_space, Qzero_width;
-/* Default pixel width of `thin-space' display method.  */
-#define THIN_SPACE_WIDTH 1
 /* Default number of seconds to wait before displaying an hourglass
   cursor.  */
 #define DEFAULT_HOURGLASS_DELAY 1
+#ifdef HAVE_WINDOW_SYSTEM
+/* Default pixel width of `thin-space' display method.  */
+#define THIN_SPACE_WIDTH 1
+#endif /* HAVE_WINDOW_SYSTEM */
 /* Function prototypes.  */
 static void setup_for_ellipsis (struct it *, int);
@@ -973,12 +960,12 @@ window_text_bottom_y (struct window *w)
  return height;
 }
-/* Return the pixel width of display area AREA of window W.  AREA < 0
+/* Return the pixel width of display area AREA of window W.
-   means return the total width of W, not including fringes to
+   ANY_AREA means return the total width of W, not including
-   the left and right of the window.  */
+   fringes to the left and right of the window.  */
 int
-window_box_width (struct window *w, int area)
+window_box_width (struct window *w, enum glyph_row_area area)
 {
  int cols = w->total_cols;
  int pixels = 0;
@@ -1056,11 +1043,11 @@ window_box_height (struct window *w)
 }
 /* Return the window-relative coordinate of the left edge of display
-   area AREA of window W.  AREA < 0 means return the left edge of the
+   area AREA of window W.  ANY_AREA means return the left edge of the
   whole window, to the right of the left fringe of W.  */
 int
-window_box_left_offset (struct window *w, int area)
+window_box_left_offset (struct window *w, enum glyph_row_area area)
 {
  int x;
@@ -1088,21 +1075,21 @@ window_box_left_offset (struct window *w, int area)
 /* Return the window-relative coordinate of the right edge of display
-   area AREA of window W.  AREA < 0 means return the right edge of the
+   area AREA of window W.  ANY_AREA means return the right edge of the
   whole window, to the left of the right fringe of W.  */
 int
-window_box_right_offset (struct window *w, int area)
+window_box_right_offset (struct window *w, enum glyph_row_area area)
 {
  return window_box_left_offset (w, area) + window_box_width (w, area);
 }
 /* Return the frame-relative coordinate of the left edge of display
-   area AREA of window W.  AREA < 0 means return the left edge of the
+   area AREA of window W.  ANY_AREA means return the left edge of the
   whole window, to the right of the left fringe of W.  */
 int
-window_box_left (struct window *w, int area)
+window_box_left (struct window *w, enum glyph_row_area area)
 {
  struct frame *f = XFRAME (w->frame);
  int x;
@@ -1118,25 +1105,25 @@ window_box_left (struct window *w, int area)
 /* Return the frame-relative coordinate of the right edge of display
-   area AREA of window W.  AREA < 0 means return the right edge of the
+   area AREA of window W.  ANY_AREA means return the right edge of the
   whole window, to the left of the right fringe of W.  */
 int
-window_box_right (struct window *w, int area)
+window_box_right (struct window *w, enum glyph_row_area area)
 {
  return window_box_left (w, area) + window_box_width (w, area);
 }
 /* Get the bounding box of the display area AREA of window W, without
-   mode lines, in frame-relative coordinates.  AREA < 0 means the
+   mode lines, in frame-relative coordinates.  ANY_AREA means the
   whole window, not including the left and right fringes of
   the window.  Return in *BOX_X and *BOX_Y the frame-relative pixel
   coordinates of the upper-left corner of the box.  Return in
   *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box.  */
 void
-window_box (struct window *w, int area, int *box_x, int *box_y,
+window_box (struct window *w, enum glyph_row_area area, int *box_x,
-            int *box_width, int *box_height)
+            int *box_y, int *box_width, int *box_height)
 {
  if (box_width)
    *box_width = window_box_width (w, area);
@@ -1152,27 +1139,27 @@ window_box (struct window *w, int area, int *box_x, int *box_y,
    }
 }
+#ifdef HAVE_WINDOW_SYSTEM
 /* Get the bounding box of the display area AREA of window W, without
-   mode lines.  AREA < 0 means the whole window, not including the
+   mode lines and both fringes of the window.  Return in *TOP_LEFT_X
-   left and right fringe of the window.  Return in *TOP_LEFT_X
   and TOP_LEFT_Y the frame-relative pixel coordinates of the
   upper-left corner of the box.  Return in *BOTTOM_RIGHT_X, and
   *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the
   box.  */
 static void
-window_box_edges (struct window *w, int area, int *top_left_x, int *top_left_y,
+window_box_edges (struct window *w, int *top_left_x, int *top_left_y,
-                   int *bottom_right_x, int *bottom_right_y)
+                  int *bottom_right_x, int *bottom_right_y)
 {
-  window_box (w, area, top_left_x, top_left_y, bottom_right_x,
+  window_box (w, ANY_AREA, top_left_x, top_left_y,
-              bottom_right_y);
+              bottom_right_x, bottom_right_y);
  *bottom_right_x += *top_left_x;
  *bottom_right_y += *top_left_y;
 }
+#endif /* HAVE_WINDOW_SYSTEM */
 /***********************************************************************
                              Utilities
 ***********************************************************************/
@@ -1359,12 +1346,12 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
  /* Compute exact mode line heights.  */
  if (WINDOW_WANTS_MODELINE_P (w))
-    current_mode_line_height
+    w->mode_line_height
      = display_mode_line (w, CURRENT_MODE_LINE_FACE_ID (w),
                           BVAR (current_buffer, mode_line_format));
  if (WINDOW_WANTS_HEADER_LINE_P (w))
-    current_header_line_height
+    w->header_line_height
      = display_mode_line (w, HEADER_LINE_FACE_ID,
                           BVAR (current_buffer, header_line_format));
@@ -1657,8 +1644,6 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
  if (old_buffer)
    set_buffer_internal_1 (old_buffer);
-  current_header_line_height = current_mode_line_height = -1;
  if (visible_p && w->hscroll > 0)
    *x -=
      window_hscroll_limited (w, WINDOW_XFRAME (w))
@@ -6721,17 +6706,59 @@ lookup_glyphless_char_display (int c, struct it *it)
  return glyphless_method;
 }
-/* Load IT's display element fields with information about the next
+/* Merge escape glyph face and cache the result.  */
-   display element from the current position of IT.  Value is zero if
-   end of buffer (or C string) is reached.  */
 static struct frame *last_escape_glyph_frame = NULL;
 static int last_escape_glyph_face_id = (1 << FACE_ID_BITS);
 static int last_escape_glyph_merged_face_id = 0;
-struct frame *last_glyphless_glyph_frame = NULL;
+static int
-int last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
+merge_escape_glyph_face (struct it *it)
-int last_glyphless_glyph_merged_face_id = 0;
+{
+  int face_id;
+  if (it->f == last_escape_glyph_frame
+      && it->face_id == last_escape_glyph_face_id)
+    face_id = last_escape_glyph_merged_face_id;
+  else
+    {
+      /* Merge the `escape-glyph' face into the current face.  */
+      face_id = merge_faces (it->f, Qescape_glyph, 0, it->face_id);
+      last_escape_glyph_frame = it->f;
+      last_escape_glyph_face_id = it->face_id;
+      last_escape_glyph_merged_face_id = face_id;
+    }
+  return face_id;
+}
+/* Likewise for glyphless glyph face.  */
+static struct frame *last_glyphless_glyph_frame = NULL;
+static int last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
+static int last_glyphless_glyph_merged_face_id = 0;
+int
+merge_glyphless_glyph_face (struct it *it)
+{
+  int face_id;
+  if (it->f == last_glyphless_glyph_frame
+      && it->face_id == last_glyphless_glyph_face_id)
+    face_id = last_glyphless_glyph_merged_face_id;
+  else
+    {
+      /* Merge the `glyphless-char' face into the current face.  */
+      face_id = merge_faces (it->f, Qglyphless_char, 0, it->face_id);
+      last_glyphless_glyph_frame = it->f;
+      last_glyphless_glyph_face_id = it->face_id;
+      last_glyphless_glyph_merged_face_id = face_id;
+    }
+  return face_id;
+}
+/* Load IT's display element fields with information about the next
+   display element from the current position of IT.  Value is zero if
+   end of buffer (or C string) is reached.  */
 static int
 get_next_display_element (struct it *it)
@@ -6879,24 +6906,10 @@ get_next_display_element (struct it *it)
                      g = GLYPH_CODE_CHAR (gc);
                      lface_id = GLYPH_CODE_FACE (gc);
                    }
-                  if (lface_id)
-                    {
+                  face_id = (lface_id
-                      face_id = merge_faces (it->f, Qt, lface_id, it->face_id);
+                             ? merge_faces (it->f, Qt, lface_id, it->face_id)
-                    }
+                             : merge_escape_glyph_face (it));
-                  else if (it->f == last_escape_glyph_frame
-                           && it->face_id == last_escape_glyph_face_id)
-                    {
-                      face_id = last_escape_glyph_merged_face_id;
-                    }
-                  else
-                    {
-                      /* Merge the escape-glyph face into the current face.  */
-                      face_id = merge_faces (it->f, Qescape_glyph, 0,
-                                             it->face_id);
-                      last_escape_glyph_frame = it->f;
-                      last_escape_glyph_face_id = it->face_id;
-                      last_escape_glyph_merged_face_id = face_id;
-                    }
                  XSETINT (it->ctl_chars[0], g);
                  XSETINT (it->ctl_chars[1], c ^ 0100);
@@ -6928,27 +6941,10 @@ get_next_display_element (struct it *it)
                  escape_glyph = GLYPH_CODE_CHAR (gc);
                  lface_id = GLYPH_CODE_FACE (gc);
                }
-              if (lface_id)
-                {
+              face_id = (lface_id
-                  /* The display table specified a face.
+                         ? merge_faces (it->f, Qt, lface_id, it->face_id)
-                     Merge it into face_id and also into escape_glyph.  */
+                         : merge_escape_glyph_face (it));
-                  face_id = merge_faces (it->f, Qt, lface_id,
-                                         it->face_id);
-                }
-              else if (it->f == last_escape_glyph_frame
-                       && it->face_id == last_escape_glyph_face_id)
-                {
-                  face_id = last_escape_glyph_merged_face_id;
-                }
-              else
-                {
-                  /* Merge the escape-glyph face into the current face.  */
-                  face_id = merge_faces (it->f, Qescape_glyph, 0,
-                                         it->face_id);
-                  last_escape_glyph_frame = it->f;
-                  last_escape_glyph_face_id = it->face_id;
-                  last_escape_glyph_merged_face_id = face_id;
-                }
              /* Draw non-ASCII hyphen with just highlighting: */
@@ -10827,11 +10823,9 @@ clear_garbaged_frames (void)
          if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
            {
              if (f->resized_p)
-                {
+                redraw_frame (f);
-                  redraw_frame (f);
+              else
-                  f->force_flush_display_p = 1;
+                clear_current_matrices (f);
-                }
-              clear_current_matrices (f);
              changed_count++;
              f->garbaged = 0;
              f->resized_p = 0;
@@ -10919,7 +10913,7 @@ echo_area_display (int update_frame_p)
                 Can do with a display update of the echo area,
                 unless we displayed some mode lines.  */
              update_single_window (w, 1);
-              FRAME_RIF (f)->flush_display (f);
+              flush_frame (f);
            }
          else
            update_frame (f, 1, 1);
@@ -11501,62 +11495,6 @@ update_menu_bar (struct frame *f, int save_match_data, int hooks_run)
  return hooks_run;
 }
-/***********************************************************************
-                            Output Cursor
- ***********************************************************************/
-#ifdef HAVE_WINDOW_SYSTEM
-/* EXPORT:
-   Nominal cursor position -- where to draw output.
-   HPOS and VPOS are window relative glyph matrix coordinates.
-   X and Y are window relative pixel coordinates.  */
-struct cursor_pos output_cursor;
-/* EXPORT:
-   Set the global variable output_cursor to CURSOR.  All cursor
-   positions are relative to currently updated window.  */
-void
-set_output_cursor (struct cursor_pos *cursor)
-{
-  output_cursor.hpos = cursor->hpos;
-  output_cursor.vpos = cursor->vpos;
-  output_cursor.x = cursor->x;
-  output_cursor.y = cursor->y;
-}
-/* EXPORT for RIF:
-   Set a nominal cursor position.
-   HPOS and VPOS are column/row positions in a window glyph matrix.
-   X and Y are window text area relative pixel positions.
-   This is always done during window update, so the position is the
-   future output cursor position for currently updated window W.
-   NOTE: W is used only to check whether this function is called
-   in a consistent manner via the redisplay interface.  */
-void
-x_cursor_to (struct window *w, int vpos, int hpos, int y, int x)
-{
-  eassert (w);
-  /* Set the output cursor.  */
-  output_cursor.hpos = hpos;
-  output_cursor.vpos = vpos;
-  output_cursor.x = x;
-  output_cursor.y = y;
-}
-#endif /* HAVE_WINDOW_SYSTEM */
 /***********************************************************************
                               Tool-bars
 ***********************************************************************/
@@ -12108,7 +12046,7 @@ redisplay_tool_bar (struct frame *f)
          if (WINDOW_TOTAL_LINES (w) != old_height)
            {
              clear_glyph_matrix (w->desired_matrix);
-              fonts_changed_p = 1;
+              f->fonts_changed = 1;
              return 1;
            }
        }
@@ -12209,7 +12147,7 @@ redisplay_tool_bar (struct frame *f)
                {
                  clear_glyph_matrix (w->desired_matrix);
                  f->n_tool_bar_rows = nrows;
-                  fonts_changed_p = 1;
+                  f->fonts_changed = 1;
                  return 1;
                }
            }
@@ -13095,15 +13033,6 @@ redisplay_internal (void)
  last_glyphless_glyph_frame = NULL;
  last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
-  /* If new fonts have been loaded that make a glyph matrix adjustment
-     necessary, do it.  */
-  if (fonts_changed_p)
-    {
-      adjust_glyphs (NULL);
-      ++windows_or_buffers_changed;
-      fonts_changed_p = 0;
-    }
  /* If face_change_count is non-zero, init_iterator will free all
     realized faces, which includes the faces referenced from current
     matrices.  So, we can't reuse current matrices in this case.  */
@@ -13134,7 +13063,19 @@ redisplay_internal (void)
      struct frame *f = XFRAME (frame);
      if (FRAME_VISIBLE_P (f))
-        ++number_of_visible_frames;
+        {
+          ++number_of_visible_frames;
+          /* Adjust matrices for visible frames only.  */
+          if (f->fonts_changed)
+            {
+              adjust_frame_glyphs (f);
+              f->fonts_changed = 0;
+            }
+          /* If cursor type has been changed on the frame
+             other than selected, consider all frames.  */
+          if (f != sf && f->cursor_type_changed)
+            update_mode_lines++;
+        }
      clear_desired_matrices (f);
    }
@@ -13183,8 +13124,7 @@ redisplay_internal (void)
    }
  consider_all_windows_p = (update_mode_lines
-                            || buffer_shared_and_changed ()
+                            || buffer_shared_and_changed ());
-                            || cursor_type_changed);
  /* If specs for an arrow have changed, do thorough redisplay
     to ensure we remove any arrow that should no longer exist.  */
@@ -13218,9 +13158,7 @@ redisplay_internal (void)
      if (!display_last_displayed_message_p)
        message_cleared_p = 0;
-      if (fonts_changed_p)
+      if (window_height_changed_p)
-        goto retry;
-      else if (window_height_changed_p)
        {
          consider_all_windows_p = 1;
          ++update_mode_lines;
@@ -13277,6 +13215,7 @@ redisplay_internal (void)
      && !current_buffer->prevent_redisplay_optimizations_p
      && FRAME_VISIBLE_P (XFRAME (w->frame))
      && !FRAME_OBSCURED_P (XFRAME (w->frame))
+      && !XFRAME (w->frame)->cursor_type_changed
      /* Make sure recorded data applies to current buffer, etc.  */
      && this_line_buffer == current_buffer
      && match_p
@@ -13502,6 +13441,8 @@ redisplay_internal (void)
              && !EQ (FRAME_TTY (f)->top_frame, frame))
            continue;
+        retry_frame:
          if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
            {
              /* Mark all the scroll bars to be removed; we'll redeem
@@ -13521,20 +13462,22 @@ redisplay_internal (void)
              if (FRAME_TERMINAL (f)->judge_scroll_bars_hook)
                FRAME_TERMINAL (f)->judge_scroll_bars_hook (f);
-              /* If fonts changed, display again.  */
-              /* ??? rms: I suspect it is a mistake to jump all the way
-                 back to retry here.  It should just retry this frame.  */
-              if (fonts_changed_p)
-                goto retry;
              if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
                {
+                  /* If fonts changed on visible frame, display again.  */
+                  if (f->fonts_changed)
+                    {
+                      adjust_frame_glyphs (f);
+                      f->fonts_changed = 0;
+                      goto retry_frame;
+                    }
                  /* See if we have to hscroll.  */
                  if (!f->already_hscrolled_p)
                    {
                      f->already_hscrolled_p = 1;
                      if (hscroll_windows (f->root_window))
-                        goto retry;
+                        goto retry_frame;
                    }
                  /* Prevent various kinds of signals during display
@@ -13548,6 +13491,7 @@ redisplay_internal (void)
                  /* Update the display.  */
                  set_window_update_flags (XWINDOW (f->root_window), 1);
                  pending |= update_frame (f, 0, 0);
+                  f->cursor_type_changed = 0;
                  f->updated_p = 1;
                }
            }
@@ -13592,7 +13536,7 @@ redisplay_internal (void)
    update:
      /* If fonts changed, display again.  */
-      if (fonts_changed_p)
+      if (sf->fonts_changed)
        goto retry;
      /* Prevent various kinds of signals during display update.
@@ -13609,6 +13553,7 @@ redisplay_internal (void)
          XWINDOW (selected_window)->must_be_updated_p = 1;
          pending = update_frame (sf, 0, 0);
+          sf->cursor_type_changed = 0;
        }
      /* We may have called echo_area_display at the top of this
@@ -13623,6 +13568,7 @@ redisplay_internal (void)
        {
          XWINDOW (mini_window)->must_be_updated_p = 1;
          pending |= update_frame (mini_frame, 0, 0);
+          mini_frame->cursor_type_changed = 0;
          if (!pending && hscroll_windows (mini_window))
            goto retry;
        }
@@ -13663,7 +13609,6 @@ redisplay_internal (void)
      update_mode_lines = 0;
      windows_or_buffers_changed = 0;
-      cursor_type_changed = 0;
    }
  /* Start SIGIO interrupts coming again.  Having them off during the
@@ -13761,9 +13706,7 @@ redisplay_preserve_echo_area (int from_where)
  else
    redisplay_internal ();
-  if (FRAME_RIF (SELECTED_FRAME ()) != NULL
+  flush_frame (SELECTED_FRAME ());
-      && FRAME_RIF (SELECTED_FRAME ())->flush_display_optional)
-    FRAME_RIF (SELECTED_FRAME ())->flush_display_optional (NULL);
 }
@@ -15105,7 +15048,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
         cases.  */
      && !update_mode_lines
      && !windows_or_buffers_changed
-      && !cursor_type_changed
+      && !f->cursor_type_changed
      /* Can't use this case if highlighting a region.  When a
         region exists, cursor movement has to do more than just
         set the cursor.  */
@@ -15452,9 +15395,8 @@ set_vertical_scroll_bar (struct window *w)
 /* Redisplay leaf window WINDOW.  JUST_THIS_ONE_P non-zero means only
   selected_window is redisplayed.
-   We can return without actually redisplaying the window if
+   We can return without actually redisplaying the window if fonts has been
-   fonts_changed_p.  In that case, redisplay_internal will
+   changed on window's frame.  In that case, redisplay_internal will retry.  */
-   retry.  */
 static void
 redisplay_window (Lisp_Object window, int just_this_one_p)
@@ -15839,7 +15781,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
      debug_method_add (w, "try_window_id %d", tem);
 #endif
-      if (fonts_changed_p)
+      if (f->fonts_changed)
        goto need_larger_matrices;
      if (tem > 0)
        goto done;
@@ -15909,12 +15851,12 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
          IF_DEBUG (debug_method_add (w, "1"));
          if (try_window (window, startp, TRY_WINDOW_CHECK_MARGINS) < 0)
            /* -1 means we need to scroll.
-               0 means we need new matrices, but fonts_changed_p
+               0 means we need new matrices, but fonts_changed
               is set in that case, so we will detect it below.  */
            goto try_to_scroll;
        }
-      if (fonts_changed_p)
+      if (f->fonts_changed)
        goto need_larger_matrices;
      if (w->cursor.vpos >= 0)
@@ -16102,7 +16044,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
  /* Redisplay the window.  */
  if (!current_matrix_up_to_date_p
      || windows_or_buffers_changed
-      || cursor_type_changed
+      || f->cursor_type_changed
      /* Don't use try_window_reusing_current_matrix in this case
         because it can have changed the buffer.  */
      || !NILP (Vwindow_scroll_functions)
@@ -16115,7 +16057,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
  /* If new fonts have been loaded (due to fontsets), give up.  We
     have to start a new redisplay since we need to re-adjust glyph
     matrices.  */
-  if (fonts_changed_p)
+  if (f->fonts_changed)
    goto need_larger_matrices;
  /* If cursor did not appear assume that the middle of the window is
@@ -16228,7 +16170,8 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
      if (WINDOW_WANTS_MODELINE_P (w)
          && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w))
        {
-          fonts_changed_p = 1;
+          f->fonts_changed = 1;
+          w->mode_line_height = -1;
          MATRIX_MODE_LINE_ROW (w->current_matrix)->height
            = DESIRED_MODE_LINE_HEIGHT (w);
        }
@@ -16238,12 +16181,13 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
      if (WINDOW_WANTS_HEADER_LINE_P (w)
          && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w))
        {
-          fonts_changed_p = 1;
+          f->fonts_changed = 1;
+          w->header_line_height = -1;
          MATRIX_HEADER_LINE_ROW (w->current_matrix)->height
            = DESIRED_HEADER_LINE_HEIGHT (w);
        }
-      if (fonts_changed_p)
+      if (f->fonts_changed)
        goto need_larger_matrices;
    }
@@ -16308,8 +16252,8 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
    }
 #endif /* HAVE_WINDOW_SYSTEM */
-  /* We go to this label, with fonts_changed_p set,
+  /* We go to this label, with fonts_changed set, if it is
-     if it is necessary to try again using larger glyph matrices.
+     necessary to try again using larger glyph matrices.
     We have to redeem the scroll bar even in this case,
     because the loop in redisplay_internal expects that.  */
 need_larger_matrices:
@@ -16383,7 +16327,7 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
    {
      if (display_line (&it))
        last_text_row = it.glyph_row - 1;
-      if (fonts_changed_p && !(flags & TRY_WINDOW_IGNORE_FONTS_CHANGE))
+      if (f->fonts_changed && !(flags & TRY_WINDOW_IGNORE_FONTS_CHANGE))
        return 0;
    }
 #ifdef HAVE_XWIDGETS_xxx
@@ -16493,7 +16437,7 @@ try_window_reusing_current_matrix (struct window *w)
      /* Don't try to reuse the display if windows have been split
         or such.  */
      || windows_or_buffers_changed
-      || cursor_type_changed)
+      || f->cursor_type_changed)
    return 0;
  /* Can't do this if region may have changed.  */
@@ -16541,8 +16485,7 @@ try_window_reusing_current_matrix (struct window *w)
      w->cursor.vpos = -1;
      last_text_row = last_reused_text_row = NULL;
-      while (it.current_y < it.last_visible_y
+      while (it.current_y < it.last_visible_y && !f->fonts_changed)
-             && !fonts_changed_p)
        {
          /* If we have reached into the characters in the START row,
             that means the line boundaries have changed.  So we
@@ -16753,7 +16696,7 @@ try_window_reusing_current_matrix (struct window *w)
      if (pt_row == NULL)
        w->cursor.vpos = -1;
      last_text_row = NULL;
-      while (it.current_y < it.last_visible_y && !fonts_changed_p)
+      while (it.current_y < it.last_visible_y && !f->fonts_changed)
        if (display_line (&it))
          last_text_row = it.glyph_row - 1;
@@ -17272,7 +17215,7 @@ try_window_id (struct window *w)
    GIVE_UP (1);
  /* This flag is used to prevent redisplay optimizations.  */
-  if (windows_or_buffers_changed || cursor_type_changed)
+  if (windows_or_buffers_changed || f->cursor_type_changed)
    GIVE_UP (2);
  /* Verify that narrowing has not changed.
@@ -17603,7 +17546,7 @@ try_window_id (struct window *w)
  last_text_row = NULL;
  overlay_arrow_seen = 0;
  while (it.current_y < it.last_visible_y
-         && !fonts_changed_p
+         && !f->fonts_changed
         && (first_unchanged_at_end_row == NULL
             || IT_CHARPOS (it) < stop_pos))
    {
@@ -17611,7 +17554,7 @@ try_window_id (struct window *w)
        last_text_row = it.glyph_row - 1;
    }
-  if (fonts_changed_p)
+  if (f->fonts_changed)
    return -1;
@@ -17858,8 +17801,7 @@ try_window_id (struct window *w)
      /* Display the rest of the lines at the window end.  */
      it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
-      while (it.current_y < it.last_visible_y
+      while (it.current_y < it.last_visible_y && !f->fonts_changed)
-             && !fonts_changed_p)
        {
          /* Is it always sure that the display agrees with lines in
             the current matrix?  I don't think so, so we mark rows
@@ -19418,7 +19360,7 @@ display_line (struct it *it)
      >= it->w->desired_matrix->nrows)
    {
      it->w->nrows_scale_factor++;
-      fonts_changed_p = 1;
+      it->f->fonts_changed = 1;
      return 0;
    }
@@ -20770,13 +20712,8 @@ redisplay_mode_lines (Lisp_Object window, int force)
            {
              struct text_pos pt;
-              SET_TEXT_POS_FROM_MARKER (pt, w->pointm);
+              CLIP_TEXT_POS_FROM_MARKER (pt, w->pointm);
-              if (CHARPOS (pt) < BEGV)
+              TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
-                TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE);
-              else if (CHARPOS (pt) > (ZV - 1))
-                TEMP_SET_PT_BOTH (ZV, ZV_BYTE);
-              else
-                TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
            }
          /* Display mode lines.  */
@@ -24205,12 +24142,12 @@ draw_glyphs (struct window *w, int x, struct glyph_row *row,
 #define IT_EXPAND_MATRIX_WIDTH(it, area)                \
  {                                                     \
-    if (!fonts_changed_p                                \
+    if (!it->f->fonts_changed                           \
        && (it->glyph_row->glyphs[area]                 \
            < it->glyph_row->glyphs[area + 1]))         \
      {                                                 \
        it->w->ncols_scale_factor++;                    \
-        fonts_changed_p = 1;                            \
+        it->f->fonts_changed = 1;                       \
      }                                                 \
  }
@@ -25209,21 +25146,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
  base_height = it->ascent + it->descent;
  base_width = font->average_width;
-  /* Get a face ID for the glyph by utilizing a cache (the same way as
+  face_id = merge_glyphless_glyph_face (it);
-     done for `escape-glyph' in get_next_display_element).  */
-  if (it->f == last_glyphless_glyph_frame
-      && it->face_id == last_glyphless_glyph_face_id)
-    {
-      face_id = last_glyphless_glyph_merged_face_id;
-    }
-  else
-    {
-      /* Merge the `glyphless-char' face into the current face.  */
-      face_id = merge_faces (it->f, Qglyphless_char, 0, it->face_id);
-      last_glyphless_glyph_frame = it->f;
-      last_glyphless_glyph_face_id = it->face_id;
-      last_glyphless_glyph_merged_face_id = face_id;
-    }
  if (it->glyphless_method == GLYPHLESS_DISPLAY_THIN_SPACE)
    {
@@ -26037,7 +25960,7 @@ x_write_glyphs (struct window *w, struct glyph_row *updated_row,
  /* Write glyphs.  */
  hpos = start - updated_row->glyphs[updated_area];
-  x = draw_glyphs (w, output_cursor.x,
+  x = draw_glyphs (w, w->output_cursor.x,
                   updated_row, updated_area,
                   hpos, hpos + len,
                   DRAW_NORMAL_TEXT, 0);
@@ -26045,7 +25968,7 @@ x_write_glyphs (struct window *w, struct glyph_row *updated_row,
  /* Invalidate old phys cursor if the glyph at its hpos is redrawn.  */
  if (updated_area == TEXT_AREA
      && w->phys_cursor_on_p
-      && w->phys_cursor.vpos == output_cursor.vpos
+      && w->phys_cursor.vpos == w->output_cursor.vpos
      && chpos >= hpos
      && chpos < hpos + len)
    w->phys_cursor_on_p = 0;
@@ -26053,8 +25976,8 @@ x_write_glyphs (struct window *w, struct glyph_row *updated_row,
  unblock_input ();
  /* Advance the output cursor.  */
-  output_cursor.hpos += len;
+  w->output_cursor.hpos += len;
-  output_cursor.x = x;
+  w->output_cursor.x = x;
 }
@@ -26087,25 +26010,25 @@ x_insert_glyphs (struct window *w, struct glyph_row *updated_row,
  /* Get the width of the region to shift right.  */
  shifted_region_width = (window_box_width (w, updated_area)
-                          - output_cursor.x
+                          - w->output_cursor.x
                          - shift_by_width);
  /* Shift right.  */
-  frame_x = window_box_left (w, updated_area) + output_cursor.x;
+  frame_x = window_box_left (w, updated_area) + w->output_cursor.x;
-  frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, output_cursor.y);
+  frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, w->output_cursor.y);
  FRAME_RIF (f)->shift_glyphs_for_insert (f, frame_x, frame_y, shifted_region_width,
                                          line_height, shift_by_width);
  /* Write the glyphs.  */
  hpos = start - row->glyphs[updated_area];
-  draw_glyphs (w, output_cursor.x, row, updated_area,
+  draw_glyphs (w, w->output_cursor.x, row, updated_area,
               hpos, hpos + len,
               DRAW_NORMAL_TEXT, 0);
  /* Advance the output cursor.  */
-  output_cursor.hpos += len;
+  w->output_cursor.hpos += len;
-  output_cursor.x += shift_by_width;
+  w->output_cursor.x += shift_by_width;
  unblock_input ();
 }
@@ -26144,16 +26067,16 @@ x_clear_end_of_line (struct window *w, struct glyph_row *updated_row,
  else
    to_x = min (to_x, max_x);
-  to_y = min (max_y, output_cursor.y + updated_row->height);
+  to_y = min (max_y, w->output_cursor.y + updated_row->height);
  /* Notice if the cursor will be cleared by this operation.  */
  if (!updated_row->full_width_p)
    notice_overwritten_cursor (w, updated_area,
-                               output_cursor.x, -1,
+                               w->output_cursor.x, -1,
                               updated_row->y,
                               MATRIX_ROW_BOTTOM_Y (updated_row));
-  from_x = output_cursor.x;
+  from_x = w->output_cursor.x;
  /* Translate to frame coordinates.  */
  if (updated_row->full_width_p)
@@ -26169,7 +26092,7 @@ x_clear_end_of_line (struct window *w, struct glyph_row *updated_row,
    }
  min_y = WINDOW_HEADER_LINE_HEIGHT (w);
-  from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, output_cursor.y));
+  from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, w->output_cursor.y));
  to_y = WINDOW_TO_FRAME_PIXEL_Y (w, to_y);
  /* Prevent inadvertently clearing to end of the X window.  */
@@ -26267,7 +26190,7 @@ set_frame_cursor_types (struct frame *f, Lisp_Object arg)
    FRAME_BLINK_OFF_CURSOR (f) = DEFAULT_CURSOR;
  /* Make sure the cursor gets redrawn.  */
-  cursor_type_changed = 1;
+  f->cursor_type_changed = 1;
 }
@@ -29037,7 +28960,7 @@ x_draw_vertical_border (struct window *w)
    {
      int x0, x1, y0, y1;
-      window_box_edges (w, -1, &x0, &y0, &x1, &y1);
+      window_box_edges (w, &x0, &y0, &x1, &y1);
      y1 -= 1;
      if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
@@ -29050,7 +28973,7 @@ x_draw_vertical_border (struct window *w)
    {
      int x0, x1, y0, y1;
-      window_box_edges (w, -1, &x0, &y0, &x1, &y1);
+      window_box_edges (w, &x0, &y0, &x1, &y1);
      y1 -= 1;
      if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
@@ -29959,8 +29882,10 @@ cursor shapes.  */);
               doc: /* Seconds to wait before displaying an hourglass pointer when Emacs is busy.  */);
  Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
+#ifdef HAVE_WINDOW_SYSTEM
  hourglass_atimer = NULL;
  hourglass_shown_p = 0;
+#endif /* HAVE_WINDOW_SYSTEM */
  DEFSYM (Qglyphless_char, "glyphless-char");
  DEFSYM (Qhex_code, "hex-code");
@@ -30002,8 +29927,6 @@ Its value should be an ASCII acronym string, `hex-code', `empty-box', or
 void
 init_xdisp (void)
 {
-  current_header_line_height = current_mode_line_height = -1;
  CHARPOS (this_line_start_pos) = 0;
  if (!noninteractive)
@@ -30047,13 +29970,14 @@ init_xdisp (void)
  help_echo_showing_p = 0;
 }
+#ifdef HAVE_WINDOW_SYSTEM
 /* Platform-independent portion of hourglass implementation.  */
 /* Cancel a currently active hourglass timer, and start a new one.  */
 void
 start_hourglass (void)
 {
-#if defined (HAVE_WINDOW_SYSTEM)
  struct timespec delay;
  cancel_hourglass ();
@@ -30078,7 +30002,6 @@ start_hourglass (void)
  hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
                                   show_hourglass, NULL);
-#endif
 }
@@ -30087,7 +30010,6 @@ start_hourglass (void)
 void
 cancel_hourglass (void)
 {
-#if defined (HAVE_WINDOW_SYSTEM)
  if (hourglass_atimer)
    {
      cancel_atimer (hourglass_atimer);
@@ -30096,5 +30018,6 @@ cancel_hourglass (void)
  if (hourglass_shown_p)
    hide_hourglass ();
-#endif
 }
+#endif /* HAVE_WINDOW_SYSTEM */
diff --git a/src/xfaces.c b/src/xfaces.c
index a55ac90086d..e8cb7a70322 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -211,13 +211,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 #include "termhooks.h"
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
 #ifdef USE_MOTIF
 #include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 #endif /* USE_MOTIF */
-#endif /* HAVE_X_WINDOWS */
 #ifdef MSDOS
 #include "dosfns.h"
@@ -238,6 +235,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO
 #define GCGraphicsExposures 0
 #endif /* HAVE_NS */
+/* Number of pt per inch (from the TeXbook).  */
+#define PT_PER_INCH 72.27
 #endif /* HAVE_WINDOW_SYSTEM */
 #include "buffer.h"
@@ -272,10 +274,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <c-ctype.h>
-/* Number of pt per inch (from the TeXbook).  */
-#define PT_PER_INCH 72.27
 /* Non-zero if face attribute ATTR is unspecified.  */
 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified)
@@ -396,6 +394,8 @@ static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_val
 static Lisp_Object Qtty_color_alist;
+#ifdef HAVE_WINDOW_SYSTEM
 /* Counter for calls to clear_face_cache.  If this counter reaches
   CLEAR_FONT_TABLE_COUNT, and a frame has more than
   CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed.  */
@@ -404,6 +404,8 @@ static int clear_font_table_count;
 #define CLEAR_FONT_TABLE_COUNT  100
 #define CLEAR_FONT_TABLE_NFONTS 10
+#endif /* HAVE_WINDOW_SYSTEM */
 /* Non-zero means face attributes have been changed since the last
   redisplay.  Used in redisplay_internal.  */
@@ -434,29 +436,27 @@ static int ngcs;
 static int menu_face_changed_default;
-/* Function prototypes.  */
-struct table_entry;
 struct named_merge_point;
-static void set_font_frame_param (Lisp_Object, Lisp_Object);
 static struct face *realize_face (struct face_cache *, Lisp_Object *,
                                  int);
-static struct face *realize_non_ascii_face (struct frame *, Lisp_Object,
-                                            struct face *);
 static struct face *realize_x_face (struct face_cache *, Lisp_Object *);
 static struct face *realize_tty_face (struct face_cache *, Lisp_Object *);
 static bool realize_basic_faces (struct frame *);
 static bool realize_default_face (struct frame *);
 static void realize_named_face (struct frame *, Lisp_Object, int);
 static struct face_cache *make_face_cache (struct frame *);
-static void clear_face_gcs (struct face_cache *);
 static void free_face_cache (struct face_cache *);
 static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *,
                           int, struct named_merge_point *);
+#ifdef HAVE_WINDOW_SYSTEM
+static void set_font_frame_param (Lisp_Object, Lisp_Object);
+static void clear_face_gcs (struct face_cache *);
+static struct face *realize_non_ascii_face (struct frame *, Lisp_Object,
+                                            struct face *);
+#endif /* HAVE_WINDOW_SYSTEM */
 /***********************************************************************
                              Utilities
 ***********************************************************************/
@@ -3983,6 +3983,7 @@ lface_hash (Lisp_Object *v)
          ^ XHASH (v[LFACE_HEIGHT_INDEX]));
 }
+#ifdef HAVE_WINDOW_SYSTEM
 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without
   considering charsets/registries).  They do if they specify the same
@@ -4011,8 +4012,8 @@ lface_same_font_attributes_p (Lisp_Object *lface1, Lisp_Object *lface2)
          );
 }
+#endif /* HAVE_WINDOW_SYSTEM */
 /***********************************************************************
                            Realized Faces
 ***********************************************************************/
@@ -4171,6 +4172,7 @@ make_face_cache (struct frame *f)
  return c;
 }
+#ifdef HAVE_WINDOW_SYSTEM
 /* Clear out all graphics contexts for all realized faces, except for
   the basic faces.  This should be done from time to time just to avoid
@@ -4181,7 +4183,6 @@ clear_face_gcs (struct face_cache *c)
 {
  if (c && FRAME_WINDOW_P (c->f))
    {
-#ifdef HAVE_WINDOW_SYSTEM
      int i;
      for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i)
        {
@@ -4196,10 +4197,10 @@ clear_face_gcs (struct face_cache *c)
              unblock_input ();
            }
        }
-#endif /* HAVE_WINDOW_SYSTEM */
    }
 }
+#endif /* HAVE_WINDOW_SYSTEM */
 /* Free all realized faces in face cache C, including basic faces.
   C may be null.  If faces are freed, make sure the frame's current
diff --git a/src/xfns.c b/src/xfns.c
index 0c91e298ec8..4e8442dd3a3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -22,10 +22,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <math.h>
 #include <unistd.h>
-/* This makes the fields of a Display accessible, in Xlib header files.  */
-#define XLIB_ILLEGAL_ACCESS
 #include "lisp.h"
 #include "xterm.h"
 #include "frame.h"
@@ -1186,7 +1182,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
          block_input ();
          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                        0, y, width, height, False);
+                        0, y, width, height);
          unblock_input ();
        }
@@ -1197,7 +1193,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
          block_input ();
          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                        0, y, width, height, False);
+                        0, y, width, height);
          unblock_input ();
        }
@@ -1205,7 +1201,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
        clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
    }
 #endif /* not USE_X_TOOLKIT && not USE_GTK */
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  run_window_configuration_change_hook (f);
 }
@@ -1268,7 +1264,7 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
  FRAME_TOOL_BAR_LINES (f) = nlines;
  resize_frame_windows (f, FRAME_LINES (f), 0);
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  /* We also have to make sure that the internal border at the top of
     the frame, below the menu bar or tool bar, is redrawn when the
@@ -1295,8 +1291,8 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
      if (height > 0 && width > 0)
        {
          block_input ();
-          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                        0, y, width, height, False);
+                        0, y, width, height);
          unblock_input ();
        }
@@ -5490,7 +5486,7 @@ Text larger than the specified size is clipped.  */)
    }
  FRAME_TOTAL_COLS (f) = w->total_cols;
-  adjust_glyphs (f);
+  adjust_frame_glyphs (f);
  w->pseudo_window_p = 1;
  /* Display the tooltip text in a temporary buffer.  */
@@ -5558,7 +5554,7 @@ Text larger than the specified size is clipped.  */)
      width /= WINDOW_FRAME_COLUMN_WIDTH (w);
      w->total_cols = width;
      FRAME_TOTAL_COLS (f) = width;
-      adjust_glyphs (f);
+      adjust_frame_glyphs (f);
      clear_glyph_matrix (w->desired_matrix);
      clear_glyph_matrix (w->current_matrix);
      try_window (FRAME_ROOT_WINDOW (f), pos, 0);
diff --git a/src/xgselect.c b/src/xgselect.c
index 45a34f2e0a5..7a754bd75c0 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -29,10 +29,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 int
-xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
+xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds,
           struct timespec const *timeout, sigset_t const *sigmask)
 {
-  SELECT_TYPE all_rfds, all_wfds;
+  fd_set all_rfds, all_wfds;
  struct timespec tmo;
  struct timespec const *tmop = timeout;
diff --git a/src/xgselect.h b/src/xgselect.h
index f85c17f7190..1f8555591d0 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -25,9 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sysselect.h"
 extern int xg_select (int max_fds,
-                      SELECT_TYPE *rfds,
+                      fd_set *rfds, fd_set *wfds, fd_set *efds,
-                      SELECT_TYPE *wfds,
-                      SELECT_TYPE *efds,
                      struct timespec const *timeout,
                      sigset_t const *sigmask);
diff --git a/src/xmenu.c b/src/xmenu.c
index 98473939373..823c63bfc6f 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -378,7 +378,7 @@ x_menu_wait_for_event (void *data)
         )
    {
      struct timespec next_time = timer_check (), *ntp;
-      SELECT_TYPE read_fds;
+      fd_set read_fds;
      struct x_display_info *dpyinfo;
      int n = 0;
diff --git a/src/xterm.c b/src/xterm.c
index 548975c635a..3e05ba6fed2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -143,16 +143,11 @@ int use_xim = 1;
 int use_xim = 0;  /* configure --without-xim */
 #endif
 /* Non-zero means that a HELP_EVENT has been generated since Emacs
   start.  */
 static bool any_help_event_p;
-/* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
-static Lisp_Object last_window;
 /* This is a chain of structures for all the X displays currently in
   use.  */
@@ -300,8 +295,6 @@ static struct terminal *x_create_terminal (struct x_display_info *);
 void x_delete_terminal (struct terminal *);
 static void x_update_end (struct frame *);
 static void XTframe_up_to_date (struct frame *);
-static void XTset_terminal_modes (struct terminal *);
-static void XTreset_terminal_modes (struct terminal *);
 static void x_clear_frame (struct frame *);
 static _Noreturn void x_ins_del_lines (struct frame *, int, int);
 static void frame_highlight (struct frame *);
@@ -317,7 +310,8 @@ static void x_draw_hollow_cursor (struct window *, struct glyph_row *);
 static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
                               enum text_cursor_kinds);
-static void x_clip_to_row (struct window *, struct glyph_row *, int, GC);
+static void x_clip_to_row (struct window *, struct glyph_row *,
+                           enum glyph_row_area, GC);
 static void x_flush (struct frame *f);
 static void x_update_begin (struct frame *);
 static void x_update_window_begin (struct window *);
@@ -343,29 +337,19 @@ static void x_wm_set_icon_pixmap (struct frame *, ptrdiff_t);
 static void x_initialize (void);
-/* Flush display of frame F, or of all frames if F is null.  */
+/* Flush display of frame F.  */
 static void
 x_flush (struct frame *f)
 {
+  eassert (f && FRAME_X_P (f));
  /* Don't call XFlush when it is not safe to redisplay; the X
     connection may be broken.  */
  if (!NILP (Vinhibit_redisplay))
    return;
  block_input ();
-  if (f)
+  XFlush (FRAME_X_DISPLAY (f));
-    {
-      eassert (FRAME_X_P (f));
-      XFlush (FRAME_X_DISPLAY (f));
-    }
-  else
-    {
-      /* Flush all displays and so all frames on them.  */
-      struct x_display_info *xdi;
-      for (xdi = x_display_list; xdi; xdi = xdi->next)
-        XFlush (xdi->display);
-    }
  unblock_input ();
 }
@@ -554,8 +538,7 @@ x_update_begin (struct frame *f)
 }
-/* Start update of window W.  Set output_cursor to the cursor
+/* Start update of window W.  */
-   position of W.  */
 static void
 x_update_window_begin (struct window *w)
@@ -563,7 +546,7 @@ x_update_window_begin (struct window *w)
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
-  set_output_cursor (&w->cursor);
+  w->output_cursor = w->cursor;
  block_input ();
@@ -621,9 +604,9 @@ x_update_window_end (struct window *w, bool cursor_on_p,
      block_input ();
      if (cursor_on_p)
-        display_and_set_cursor (w, 1, output_cursor.hpos,
+        display_and_set_cursor (w, 1,
-                                output_cursor.vpos,
+                                w->output_cursor.hpos, w->output_cursor.vpos,
-                                output_cursor.x, output_cursor.y);
+                                w->output_cursor.x, w->output_cursor.y);
      if (draw_window_fringes (w, 1))
        x_draw_vertical_border (w);
@@ -701,10 +684,10 @@ x_after_update_window_line (struct window *w, struct glyph_row *desired_row)
      block_input ();
      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    0, y, width, height, False);
+                    0, y, width, height);
      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                    FRAME_PIXEL_WIDTH (f) - width,
-                    y, width, height, False);
+                    y, width, height);
      unblock_input ();
    }
 }
@@ -719,7 +702,7 @@ x_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fring
  struct face *face = p->face;
  /* Must clip because of partially visible lines.  */
-  x_clip_to_row (w, row, -1, gc);
+  x_clip_to_row (w, row, ANY_AREA, gc);
  if (!p->overlay_p)
    {
@@ -836,27 +819,6 @@ x_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fring
  XSetClipMask (display, gc, None);
 }
-/* This is called when starting Emacs and when restarting after
-   suspend.  When starting Emacs, no X window is mapped.  And nothing
-   must be done to Emacs's own window if it is suspended (though that
-   rarely happens).  */
-static void
-XTset_terminal_modes (struct terminal *terminal)
-{
-}
-/* This is called when exiting or suspending Emacs.  Exiting will make
-   the X-windows go away, and suspending requires no action.  */
-static void
-XTreset_terminal_modes (struct terminal *terminal)
-{
-}
 /***********************************************************************
                            Glyph display
 ***********************************************************************/
@@ -2977,10 +2939,10 @@ x_delete_glyphs (struct frame *f, register int n)
   If they are <= 0, this is probably an error.  */
 void
-x_clear_area (Display *dpy, Window window, int x, int y, int width, int height, int exposures)
+x_clear_area (Display *dpy, Window window, int x, int y, int width, int height)
 {
  eassert (width > 0 && height > 0);
-  XClearArea (dpy, window, x, y, width, height, exposures);
+  XClearArea (dpy, window, x, y, width, height, False);
 }
@@ -2992,11 +2954,7 @@ x_clear_frame (struct frame *f)
  /* Clearing the frame will erase any cursor, so mark them all as no
     longer visible.  */
  mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f)));
-  output_cursor.hpos = output_cursor.vpos = 0;
-  output_cursor.x = -1;
-  /* We don't set the output cursor here because there will always
-     follow an explicit cursor_to.  */
  block_input ();
  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
@@ -3222,20 +3180,6 @@ XTring_bell (struct frame *f)
    }
 }
-/* Specify how many text lines, from the top of the window,
-   should be affected by insert-lines and delete-lines operations.
-   This, and those operations, are used only within an update
-   that is bounded by calls to x_update_begin and x_update_end.  */
-static void
-XTset_terminal_window (struct frame *f, int n)
-{
-  /* This function intentionally left blank.  */
-}
 /***********************************************************************
                              Line Dance
 ***********************************************************************/
@@ -3261,7 +3205,7 @@ x_scroll_run (struct window *w, struct run *run)
  /* Get frame-relative bounding box of the text display area of W,
     without mode lines.  Include in this box the left and right
     fringe of W.  */
-  window_box (w, -1, &x, &y, &width, &height);
+  window_box (w, ANY_AREA, &x, &y, &width, &height);
 #ifdef USE_TOOLKIT_SCROLL_BARS
  /* If the fringe is adjacent to the left (right) scroll bar of a
@@ -3777,7 +3721,6 @@ construct_mouse_click (struct input_event *result, XButtonEvent *event, struct f
  return Qnil;
 }
 /* Function to report a mouse movement to the mainstream Emacs code.
   The input handler calls this.
@@ -4197,9 +4140,9 @@ xt_action_hook (Widget widget, XtPointer client_data, String action_name,
                               scroll_bar_end_scroll, 0, 0);
      w = XWINDOW (window_being_scrolled);
-      if (!NILP (XSCROLL_BAR (w->vertical_scroll_bar)->dragging))
+      if (XSCROLL_BAR (w->vertical_scroll_bar)->dragging != -1)
        {
-          XSCROLL_BAR (w->vertical_scroll_bar)->dragging = Qnil;
+          XSCROLL_BAR (w->vertical_scroll_bar)->dragging = -1;
          /* The thumb size is incorrect while dragging: fix it.  */
          set_vertical_scroll_bar (w);
        }
@@ -4337,32 +4280,32 @@ xm_scroll_callback (Widget widget, XtPointer client_data, XtPointer call_data)
  switch (cs->reason)
    {
    case XmCR_DECREMENT:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_up_arrow;
      break;
    case XmCR_INCREMENT:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_down_arrow;
      break;
    case XmCR_PAGE_DECREMENT:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_above_handle;
      break;
    case XmCR_PAGE_INCREMENT:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_below_handle;
      break;
    case XmCR_TO_TOP:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_to_top;
      break;
    case XmCR_TO_BOTTOM:
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      part = scroll_bar_to_bottom;
      break;
@@ -4378,7 +4321,7 @@ xm_scroll_callback (Widget widget, XtPointer client_data, XtPointer call_data)
        whole = XM_SB_MAX - slider_size;
        portion = min (cs->value, whole);
        part = scroll_bar_handle;
-        bar->dragging = make_number (cs->value);
+        bar->dragging = cs->value;
      }
      break;
@@ -4426,24 +4369,24 @@ xg_scroll_callback (GtkRange     *range,
          whole = gtk_adjustment_get_upper (adj) -
            gtk_adjustment_get_page_size (adj);
          portion = min ((int)position, whole);
-          bar->dragging = make_number ((int)portion);
+          bar->dragging = portion;
        }
      break;
    case GTK_SCROLL_STEP_BACKWARD:
      part = scroll_bar_up_arrow;
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      break;
    case GTK_SCROLL_STEP_FORWARD:
      part = scroll_bar_down_arrow;
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      break;
    case GTK_SCROLL_PAGE_BACKWARD:
      part = scroll_bar_above_handle;
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      break;
    case GTK_SCROLL_PAGE_FORWARD:
      part = scroll_bar_below_handle;
-      bar->dragging = Qnil;
+      bar->dragging = -1;
      break;
    }
@@ -4457,7 +4400,7 @@ xg_scroll_callback (GtkRange     *range,
  return FALSE;
 }
-/* Callback for button release. Sets dragging to Qnil when dragging is done.  */
+/* Callback for button release. Sets dragging to -1 when dragging is done.  */
 static gboolean
 xg_end_scroll_callback (GtkWidget *widget,
@@ -4465,7 +4408,7 @@ xg_end_scroll_callback (GtkWidget *widget,
                        gpointer user_data)
 {
  struct scroll_bar *bar = user_data;
-  bar->dragging = Qnil;
+  bar->dragging = -1;
  if (WINDOWP (window_being_scrolled))
    {
      x_send_scroll_bar_event (window_being_scrolled,
@@ -4513,7 +4456,7 @@ xaw_jump_callback (Widget widget, XtPointer client_data, XtPointer call_data)
    part = scroll_bar_handle;
  window_being_scrolled = bar->window;
-  bar->dragging = make_number (portion);
+  bar->dragging = portion;
  last_scroll_bar_part = part;
  x_send_scroll_bar_event (bar->window, part, portion, whole);
 }
@@ -4552,7 +4495,7 @@ xaw_scroll_callback (Widget widget, XtPointer client_data, XtPointer call_data)
    part = scroll_bar_move_ratio;
  window_being_scrolled = bar->window;
-  bar->dragging = Qnil;
+  bar->dragging = -1;
  last_scroll_bar_part = part;
  x_send_scroll_bar_event (bar->window, part, position, height);
 }
@@ -4828,7 +4771,7 @@ x_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int positio
      shown = (float) portion / whole;
    }
-  if (NILP (bar->dragging))
+  if (bar->dragging == -1)
    {
      int size, value;
@@ -4863,7 +4806,7 @@ x_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int positio
                   NULL);
    /* Massage the top+shown values.  */
-    if (NILP (bar->dragging) || last_scroll_bar_part == scroll_bar_down_arrow)
+    if (bar->dragging == -1 || last_scroll_bar_part == scroll_bar_down_arrow)
      top = max (0, min (1, top));
    else
      top = old_top;
@@ -4875,7 +4818,7 @@ x_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int positio
       for `NARROWPROTO'.  See s/freebsd.h for an example.  */
    if (top != old_top || shown != old_shown)
      {
-        if (NILP (bar->dragging))
+        if (bar->dragging == -1)
          XawScrollbarSetThumb (widget, top, shown);
        else
          {
@@ -4940,8 +4883,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
       this case, no clear_frame is generated to reduce flickering.  */
    if (width > 0 && height > 0)
      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    left, top, width,
+                    left, top, width, window_box_height (w));
-                    window_box_height (w), False);
    window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                            /* Position and size of scroll bar.  */
@@ -4967,7 +4909,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
  bar->height = height;
  bar->start = 0;
  bar->end = 0;
-  bar->dragging = Qnil;
+  bar->dragging = -1;
  bar->fringe_extended_p = 0;
  /* Add bar to its frame's list of scroll bars.  */
@@ -5025,7 +4967,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
 static void
 x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild)
 {
-  int dragging = ! NILP (bar->dragging);
+  bool dragging = bar->dragging != -1;
  Window w = bar->x_window;
  struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
  GC gc = f->output_data.x->normal_gc;
@@ -5077,11 +5019,9 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild
       zero-height areas; that means "clear to end of window."  */
    if (start > 0)
      x_clear_area (FRAME_X_DISPLAY (f), w,
-                    /* x, y, width, height, and exposures.  */
                    VERTICAL_SCROLL_BAR_LEFT_BORDER,
                    VERTICAL_SCROLL_BAR_TOP_BORDER,
-                    inside_width, start,
+                    inside_width, start);
-                    False);
    /* Change to proper foreground color if one is specified.  */
    if (f->output_data.x->scroll_bar_foreground_pixel != -1)
@@ -5104,12 +5044,9 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild
       clear zero-height areas; that means "clear to end of window." */
    if (end < inside_height)
      x_clear_area (FRAME_X_DISPLAY (f), w,
-                    /* x, y, width, height, and exposures.  */
                    VERTICAL_SCROLL_BAR_LEFT_BORDER,
                    VERTICAL_SCROLL_BAR_TOP_BORDER + end,
-                    inside_width, inside_height - end,
+                    inside_width, inside_height - end);
-                    False);
  }
  unblock_input ();
@@ -5161,7 +5098,7 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
 #endif
  /* Get window dimensions.  */
-  window_box (w, -1, 0, &window_y, 0, &window_height);
+  window_box (w, ANY_AREA, 0, &window_y, 0, &window_height);
  top = window_y;
  width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f);
  height = window_height;
@@ -5202,11 +5139,11 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
 #ifdef USE_TOOLKIT_SCROLL_BARS
          if (fringe_extended_p)
            x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                          sb_left, top, sb_width, height, False);
+                          sb_left, top, sb_width, height);
          else
 #endif
            x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                          left, top, width, height, False);
+                          left, top, width, height);
          unblock_input ();
        }
@@ -5241,10 +5178,10 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
            {
              if (fringe_extended_p)
                x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                              sb_left, top, sb_width, height, False);
+                              sb_left, top, sb_width, height);
              else
                x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                              left, top, width, height, False);
+                              left, top, width, height);
            }
 #ifdef USE_GTK
          xg_update_scrollbar_pos (f,
@@ -5268,12 +5205,10 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
      if (VERTICAL_SCROLL_BAR_WIDTH_TRIM)
        {
          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                        left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                        left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, height);
-                        height, False);
          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                        left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-                        top, VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                        top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, height);
-                        height, False);
        }
      /* Clear areas not covered by the scroll bar because it's not as
@@ -5287,11 +5222,10 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
          {
            if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
              x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                            left + area_width -  rest, top,
+                            left + area_width - rest, top, rest, height);
-                            rest, height, False);
            else
              x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                            left, top, rest, height, False);
+                            left, top, rest, height);
          }
      }
@@ -5326,7 +5260,7 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
 #else /* not USE_TOOLKIT_SCROLL_BARS */
  /* Set the scroll bar's current state, unless we're currently being
     dragged.  */
-  if (NILP (bar->dragging))
+  if (bar->dragging == -1)
    {
      int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height);
@@ -5536,14 +5470,13 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
 #ifndef USE_TOOLKIT_SCROLL_BARS
    /* If the user has released the handle, set it to its final position.  */
-    if (event->type == ButtonRelease
+    if (event->type == ButtonRelease && bar->dragging != -1)
-        && ! NILP (bar->dragging))
      {
-        int new_start = y - XINT (bar->dragging);
+        int new_start = y - bar->dragging;
        int new_end = new_start + bar->end - bar->start;
        x_scroll_bar_set_handle (bar, new_start, new_end, 0);
-        bar->dragging = Qnil;
+        bar->dragging = -1;
      }
 #endif
@@ -5560,20 +5493,20 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
   mark bits.  */
 static void
-x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
+x_scroll_bar_note_movement (struct scroll_bar *bar, XMotionEvent *event)
 {
  struct frame *f = XFRAME (XWINDOW (bar->window)->frame);
-  last_mouse_movement_time = event->xmotion.time;
+  last_mouse_movement_time = event->time;
  f->mouse_moved = 1;
  XSETVECTOR (last_mouse_scroll_bar, bar);
  /* If we're dragging the bar, display it.  */
-  if (! NILP (bar->dragging))
+  if (bar->dragging != -1)
    {
      /* Where should the handle be now?  */
-      int new_start = event->xmotion.y - XINT (bar->dragging);
+      int new_start = event->y - bar->dragging;
      if (new_start != bar->start)
        {
@@ -5625,8 +5558,8 @@ x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
      win_y -= VERTICAL_SCROLL_BAR_TOP_BORDER;
-      if (! NILP (bar->dragging))
+      if (bar->dragging != -1)
-        win_y -= XINT (bar->dragging);
+        win_y -= bar->dragging;
      if (win_y < 0)
        win_y = 0;
@@ -5636,7 +5569,7 @@ x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
      *fp = f;
      *bar_window = bar->window;
-      if (! NILP (bar->dragging))
+      if (bar->dragging != -1)
        *part = scroll_bar_handle;
      else if (win_y < bar->start)
        *part = scroll_bar_above_handle;
@@ -5681,18 +5614,7 @@ x_scroll_bar_clear (struct frame *f)
 #endif /* not USE_TOOLKIT_SCROLL_BARS */
 }
+#ifdef ENABLE_CHECKING
-/* The main X event-reading loop - XTread_socket.  */
-/* This holds the state XLookupString needs to implement dead keys
-   and other tricks known as "compose processing".  _X Window System_
-   says that a portable program can't use this, but Stephen Gildea assures
-   me that letting the compiler initialize it to zeros will work okay.
-   This must be defined outside of XTread_socket, for the same reasons
-   given for enter_timestamp, above.  */
-static XComposeStatus compose_status;
 /* Record the last 100 characters stored
   to help debug the loss-of-chars-during-GC problem.  */
@@ -5705,6 +5627,12 @@ static short temp_buffer[100];
    temp_index = 0;                                             \
  temp_buffer[temp_index++] = (keysym)
+#else /* not ENABLE_CHECKING */
+#define STORE_KEYSYM_FOR_DEBUG(keysym) ((void)0)
+#endif /* ENABLE_CHECKING */
 /* Set this to nonzero to fake an "X I/O error"
   on a particular display.  */
@@ -5842,6 +5770,12 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
  struct coding_system coding;
  XEvent event = *eventptr;
  Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
+  /* This holds the state XLookupString needs to implement dead keys
+     and other tricks known as "compose processing".  _X Window System_
+     says that a portable program can't use this, but Stephen Gildea assures
+     me that letting the compiler initialize it to zeros will work okay.  */
+  static XComposeStatus compose_status;
  USE_SAFE_ALLOCA;
  *finish = X_EVENT_NORMAL;
@@ -6135,11 +6069,10 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
        {
 #ifdef USE_GTK
          /* This seems to be needed for GTK 2.6.  */
-          x_clear_area (event.xexpose.display,
+          x_clear_area (event.xexpose.display,
-                        event.xexpose.window,
+                        event.xexpose.window,
-                        event.xexpose.x, event.xexpose.y,
+                        event.xexpose.x, event.xexpose.y,
-                        event.xexpose.width, event.xexpose.height,
+                        event.xexpose.width, event.xexpose.height);
-                        FALSE);
 #endif
          if (!FRAME_VISIBLE_P (f))
            {
@@ -6211,7 +6144,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
    case UnmapNotify:
      /* Redo the mouse-highlight after the tooltip has gone.  */
-      if (event.xmap.window == tip_window)
+      if (event.xunmap.window == tip_window)
        {
          tip_window = 0;
          redo_mouse_highlight ();
@@ -6715,18 +6648,16 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
            /* Generate SELECT_WINDOW_EVENTs when needed.
               Don't let popup menus influence things (bug#1261).  */
            if (!NILP (Vmouse_autoselect_window) && !popup_activated ())
-              {
+              {
-                Lisp_Object window;
+                static Lisp_Object last_mouse_window;
+                Lisp_Object window = window_from_coordinates
-                window = window_from_coordinates (f,
+                  (f, event.xmotion.x, event.xmotion.y, 0, 0);
-                                                  event.xmotion.x, event.xmotion.y,
-                                                  0, 0);
+                /* Window will be selected only when it is not selected now and
+                   last mouse movement event was not in it.  Minibuffer window
-                /* Window will be selected only when it is not selected now and
+                   will be selected only when it is active.  */
-                   last mouse movement event was not in it.  Minibuffer window
+                if (WINDOWP (window)
-                   will be selected only when it is active.  */
+                    && !EQ (window, last_mouse_window)
-                if (WINDOWP (window)
-                    && !EQ (window, last_window)
                    && !EQ (window, selected_window)
                    /* For click-to-focus window managers
                       create event iff we don't leave the
@@ -6734,13 +6665,13 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
                    && (focus_follows_mouse
                        || (EQ (XWINDOW (window)->frame,
                                XWINDOW (selected_window)->frame))))
-                  {
+                  {
-                    inev.ie.kind = SELECT_WINDOW_EVENT;
+                    inev.ie.kind = SELECT_WINDOW_EVENT;
-                    inev.ie.frame_or_window = window;
+                    inev.ie.frame_or_window = window;
-                  }
+                  }
+                /* Remember the last window where we saw the mouse.  */
-                last_window=window;
+                last_mouse_window = window;
-              }
+              }
            if (!note_mouse_movement (f, &event.xmotion))
              help_echo_string = previous_help_echo_string;
          }
@@ -6752,7 +6683,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
                                        event.xmotion.window);
            if (bar)
-              x_scroll_bar_note_movement (bar, &event);
+              x_scroll_bar_note_movement (bar, &event.xmotion);
 #endif /* USE_TOOLKIT_SCROLL_BARS */
            /* If we move outside the frame, then we're
@@ -7184,7 +7115,8 @@ XTread_socket (struct terminal *terminal, struct input_event *hold_quit)
   mode lines must be clipped to the whole window.  */
 static void
-x_clip_to_row (struct window *w, struct glyph_row *row, int area, GC gc)
+x_clip_to_row (struct window *w, struct glyph_row *row,
+               enum glyph_row_area area, GC gc)
 {
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  XRectangle clip_rect;
@@ -7366,8 +7298,7 @@ x_define_frame_cursor (struct frame *f, Cursor cursor)
 static void
 x_clear_frame_area (struct frame *f, int x, int y, int width, int height)
 {
-  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), x, y, width, height);
-                x, y, width, height, False);
 #ifdef USE_GTK
  /* Must queue a redraw, because scroll bars might have been cleared.  */
  if (FRAME_GTK_WIDGET (f))
@@ -7434,9 +7365,7 @@ x_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x,
 #endif
    }
-#ifndef XFlush
  XFlush (FRAME_X_DISPLAY (f));
-#endif
 }
@@ -8189,9 +8118,6 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_
  if (change_gravity > 0)
    {
-      FRAME_X_OUTPUT (f)->left_before_move = f->left_pos;
-      FRAME_X_OUTPUT (f)->top_before_move = f->top_pos;
      f->top_pos = yoff;
      f->left_pos = xoff;
      f->size_hint_flags &= ~ (XNegative | YNegative);
@@ -8690,7 +8616,7 @@ x_wait_for_event (struct frame *f, int eventtype)
 {
  int level = interrupt_input_blocked;
-  SELECT_TYPE fds;
+  fd_set fds;
  struct timespec tmo, tmo_at, time_now;
  int fd = ConnectionNumber (FRAME_X_DISPLAY (f));
@@ -10250,9 +10176,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
  dpyinfo->x_dnd_atoms_size = 8;
  dpyinfo->x_dnd_atoms = xmalloc (sizeof *dpyinfo->x_dnd_atoms
                                  * dpyinfo->x_dnd_atoms_size);
-  connection = ConnectionNumber (dpyinfo->display);
-  dpyinfo->connection = connection;
  dpyinfo->gray
    = XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window,
                                   gray_bits, gray_width, gray_height,
@@ -10264,6 +10187,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
  xsettings_initialize (dpyinfo);
+  connection = ConnectionNumber (dpyinfo->display);
  /* This is only needed for distinguishing keyboard and process input.  */
  if (connection != 0)
    add_keyboard_wait_descriptor (connection);
@@ -10364,8 +10289,6 @@ x_delete_display (struct x_display_info *dpyinfo)
        break;
      }
-  delete_keyboard_wait_descriptor (dpyinfo->connection);
  /* Discard this display from x_display_name_list and x_display_list.
     We can't use Fdelq because that can quit.  */
  if (! NILP (x_display_name_list)
@@ -10466,13 +10389,7 @@ static struct redisplay_interface x_redisplay_interface =
    x_after_update_window_line,
    x_update_window_begin,
    x_update_window_end,
-    x_cursor_to,
-    x_flush,
-#ifdef XFlush
    x_flush,
-#else
-    0,  /* flush_display_optional */
-#endif
    x_clear_window_mouse_face,
    x_get_glyph_overhangs,
    x_fix_overlapping_area,
@@ -10494,6 +10411,7 @@ void
 x_delete_terminal (struct terminal *terminal)
 {
  struct x_display_info *dpyinfo = terminal->display_info.x;
+  int connection = -1;
  /* Protect against recursive calls.  delete_frame in
     delete_terminal calls us back when it deletes our last frame.  */
@@ -10512,6 +10430,8 @@ x_delete_terminal (struct terminal *terminal)
     and dpyinfo->display was set to 0 to indicate that.  */
  if (dpyinfo->display)
    {
+      connection = ConnectionNumber (dpyinfo->display);
      x_destroy_all_bitmaps (dpyinfo);
      XSetCloseDownMode (dpyinfo->display, DestroyAll);
@@ -10552,6 +10472,10 @@ x_delete_terminal (struct terminal *terminal)
 #endif /* ! USE_GTK */
    }
+  /* No more input on this descriptor.  */
+  if (connection != -1)
+    delete_keyboard_wait_descriptor (connection);
  /* Mark as dead. */
  dpyinfo->display = NULL;
  x_delete_display (dpyinfo);
@@ -10579,11 +10503,11 @@ x_create_terminal (struct x_display_info *dpyinfo)
  terminal->delete_glyphs_hook = x_delete_glyphs;
  terminal->ring_bell_hook = XTring_bell;
  terminal->toggle_invisible_pointer_hook = XTtoggle_invisible_pointer;
-  terminal->reset_terminal_modes_hook = XTreset_terminal_modes;
+  terminal->reset_terminal_modes_hook = NULL;
-  terminal->set_terminal_modes_hook = XTset_terminal_modes;
+  terminal->set_terminal_modes_hook = NULL;
  terminal->update_begin_hook = x_update_begin;
  terminal->update_end_hook = x_update_end;
-  terminal->set_terminal_window_hook = XTset_terminal_window;
+  terminal->set_terminal_window_hook = NULL;
  terminal->read_socket_hook = XTread_socket;
  terminal->frame_up_to_date_hook = XTframe_up_to_date;
  terminal->mouse_position_hook = XTmouse_position;
diff --git a/src/xterm.h b/src/xterm.h
index 723550c57c4..883a249629d 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -20,8 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef XTERM_H
 #define XTERM_H
-#include "dispextern.h"
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ -73,14 +71,13 @@ typedef GtkWidget *xt_or_gtk_widget;
 #define USE_GTK_TOOLTIP
 #endif
-/* Bookkeeping to distinguish X versions.  */
 #ifdef HAVE_X_I18N
 #include <X11/Xlocale.h>
 #endif
+#include "dispextern.h"
+#include "termhooks.h"
 #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \
                                         XScreenNumberOfScreen (FRAME_X_SCREEN (f)))
 #define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \
@@ -141,9 +138,6 @@ struct x_display_info
  /* The generic display parameters corresponding to this X display. */
  struct terminal *terminal;
-  /* Connection number (normally a file descriptor number).  */
-  int connection;
  /* This says how to access this display in Xlib.  */
  Display *display;
@@ -409,9 +403,6 @@ extern bool x_display_ok (const char *);
 extern void select_visual (struct x_display_info *);
-struct font;
 /* Each X frame object points to its own struct x_output object
   in the output_data.x field.  The x_output structure contains
   the information that is specific to X windows.  */
@@ -632,11 +623,6 @@ struct x_output
  int move_offset_top;
  int move_offset_left;
-  /* The frame's left/top offsets before we call XMoveWindow.  See
-     x_check_expected_move.  */
-  int left_before_move;
-  int top_before_move;
  /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame.  */
  unsigned net_wm_state_hidden_seen : 1;
 };
@@ -812,8 +798,8 @@ struct scroll_bar
  /* If the scroll bar handle is currently being dragged by the user,
     this is the number of pixels from the top of the handle to the
     place where the user grabbed it.  If the handle isn't currently
-     being dragged, this is Qnil.  */
+     being dragged, this is -1.  */
-  Lisp_Object dragging;
+  int dragging;
  /* 1 if the background of the fringe that is adjacent to a scroll
     bar is extended to the gap between the fringe and the bar.  */
@@ -919,14 +905,6 @@ struct selection_input_event
 #define SELECTION_EVENT_TIME(eventp)    \
  (((struct selection_input_event *) (eventp))->time)
-struct window;
-struct glyph_matrix;
-struct frame;
-struct input_event;
-struct face;
-struct image;
 /* From xselect.c.  */
 void x_handle_selection_notify (XSelectionEvent *);
@@ -968,7 +946,7 @@ extern bool x_alloc_lighter_color_for_widget (Widget, Display *, Colormap,
 #endif
 extern bool x_alloc_nearest_color (struct frame *, Colormap, XColor *);
 extern void x_query_color (struct frame *f, XColor *);
-extern void x_clear_area (Display *, Window, int, int, int, int, int);
+extern void x_clear_area (Display *, Window, int, int, int, int);
 #if defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK
 extern void x_mouse_leave (struct x_display_info *);
 #endif
author	Joakim Verona	2013-09-10 23:52:26 +0200
committer	Joakim Verona	2013-09-10 23:52:26 +0200
commit	63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (patch)
tree	e5078c5545c777e21944a9ee4199a6f2c6d25ca9 /src
parent	92aeabcc8a007f521a664e3aee092eb80ad0f49a (diff)
download	emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.tar.gz emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.zip