merge trunk

66 files changed, 2692 insertions, 3190 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a56298ee20..a3536cda7a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -40,6 +40,426 @@
         * font.c (font_range): Adjusted for the change of
         Vunicode_category_table.
 
+2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove unportable assumption about struct layout (Bug#8884).
+        * alloc.c (mark_buffer):
+        * buffer.c (reset_buffer_local_variables, Fbuffer_local_variables)
+        (clone_per_buffer_values): Don't assume that
+        sizeof (struct buffer) is a multiple of sizeof (Lisp_Object).
+        This isn't true in general, and it's particularly not true
+        if Emacs is configured with --with-wide-int.
+        * buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER):
+        New macros, used in the buffer.c change.
+
+2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c: Use both GConf and GSettings if both are available.
+        (store_config_changed_event): Add comment.
+        (dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
+        (store_tool_bar_style_changed): New functions.
+        (store_monospaced_changed): Add comment. Call dpyinfo_valid.
+        (struct xsettings): Move font inside HAVE_XFT.
+        (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
+        (GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
+        Move inside HAVE_XFT.
+        (something_changed_gsettingsCB): Renamed from something_changedCB.
+        Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
+        also.
+        (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
+        (GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
+        (something_changed_gconfCB): Renamed from something_changedCB.
+        Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
+        (parse_settings): Move check for font inside HAVE_XFT.
+        (read_settings, apply_xft_settings): Add comment.
+        (read_and_apply_settings): Add comment.  Call map_tool_bar_style and
+        store_tool_bar_style_changed.  Move check for font inside HAVE_XFT and
+        call store_font_name_changed.
+        (xft_settings_event): Add comment.
+        (init_gsettings): Add comment.  Get values for GSETTINGS_TOOL_BAR_STYLE
+        and GSETTINGS_FONT_NAME.  Move check for fonts within HAVE_XFT.
+        (init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
+        and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
+        (xsettings_initialize): Call init_gsettings last.
+        (xsettings_get_system_font, xsettings_get_system_normal_font): Add
+        comment.
+
+2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Random fixes.  E.g., (random) never returned negative values.
+        * fns.c (Frandom): Use GET_EMACS_TIME for random seed, and add the
+        subseconds part to the entropy, as that's a bit more random.
+        Prefer signed to unsigned, since the signedness doesn't matter and
+        in general we prefer signed.  When given a limit, use a
+        denominator equal to INTMASK + 1, not to VALMASK + 1, because the
+        latter isn't right if USE_2_TAGS_FOR_INTS.
+        * sysdep.c (get_random): Return a value in the range 0..INTMASK,
+        not 0..VALMASK.  Don't discard "excess" bits that random () returns.
+
+2011-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textprop.c (text_property_stickiness):
+        Obey Vtext_property_default_nonsticky.
+        (syms_of_textprop): Add `display' to Vtext_property_default_nonsticky.
+        * w32fns.c (syms_of_w32fns):
+        * xfns.c (syms_of_xfns): Don't Add `display' since it's there by default.
+
+2011-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (barf_or_query_if_file_exists): Use S_ISDIR.
+        This is more efficient than Ffile_directory_p and avoids a minor race.
+
+2011-07-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * buffer.c (Foverlay_put): Say what the return value is
+        (bug#7835).
+
+        * fileio.c (barf_or_query_if_file_exists): Check first if the file
+        is a directory before asking whether to use the file name
+        (bug#7564).
+        (barf_or_query_if_file_exists): Make the "File is a directory"
+        error be more correct.
+
+        * fns.c (Frequire): Remove the mention of the .gz files, since
+        that's installation-specific, but keep the mention of
+        `get-load-suffixes'.
+
+2011-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * editfns.c (Fformat_time_string): Don't assume strlen fits in int.
+        Report string overflow if the output is too long.
+
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnutls.c (Fgnutls_boot): Don't mention :verify-error.
+        (syms_of_gnutls): Remove duplicate DEFSYM for
+        Qgnutls_bootprop_verify_hostname_error, an error for
+        Qgnutls_bootprop_verify_error (which is no longer used).
+
+        * eval.c (find_handler_clause): Remove parameters `sig' and `data',
+        unused since 2011-01-26T20:02:07Z!monnier@iro.umontreal.ca.  All callers changed.
+        Also (re)move comments that are misplaced or no longer relevant.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * callint.c (Finteractive): Clarify the meaning of "@" (bug#8813).
+
+2011-07-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (Finternal_merge_in_global_face): Modify the foreground
+        and background color parameters if they have been changed.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * editfns.c (Fformat): Clarify the - and 0 flags (bug#6659).
+
+2011-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xsettings.c (SYSTEM_FONT): Define only when used.
+        No need to define when HAVE_GSETTINGS || !HAVE_XFT.
+
+        * keymap.c (access_keymap_1): Now static.
+
+2011-07-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (command_loop_1): If a down-mouse event is unbound,
+        leave any prefix arg for the up event (Bug#1586).
+
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * lread.c (syms_of_lread): Mention single symbols defined by
+        `defvar' or `defconst' (bug#7154).
+
+        * fns.c (Frequire): Mention .el.gz files (bug#7314).
+        (Frequire): Mention get-load-suffixes.
+
+2011-07-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Remove clone_number slot.
+        * window.c (Fwindow_clone_number, Fset_window_clone_number):
+        Remove.
+        (make_parent_window, make_window, saved_window)
+        (Fset_window_configuration, save_window_save): Don't deal with
+        clone numbers.
+        * buffer.c (Qclone_number): Remove declaration.
+        (sort_overlays, overlay_strings): Don't deal with clone numbers.
+
+2011-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Add multiple inheritance to keymaps.
+        * keymap.c (Fmake_composed_keymap): New function.
+        (Fset_keymap_parent): Simplify.
+        (fix_submap_inheritance): Remove.
+        (access_keymap_1): New function extracted from access_keymap to handle
+        embedded parents and handle lists of maps.
+        (access_keymap): Use it.
+        (Fkeymap_prompt, map_keymap_internal, map_keymap, store_in_keymap)
+        (Fcopy_keymap): Handle embedded parents.
+        (Fcommand_remapping, define_as_prefix): Simplify.
+        (Fkey_binding): Simplify.
+        (syms_of_keymap): Move minibuffer-local-completion-map,
+        minibuffer-local-filename-completion-map,
+        minibuffer-local-must-match-map, and
+        minibuffer-local-filename-must-match-map to Elisp.
+        (syms_of_keymap): Defsubr make-composed-keymap.
+        * keyboard.c (menu_bar_items): Use map_keymap_canonical.
+        (parse_menu_item): Trivial simplification.
+
+2011-07-01  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SETTINGS_LIBS): Fix typo.
+
+2011-07-01  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny patch)
+
+        * coding.c (Fencode_coding_string): Record the last coding system
+        used, as the function doc string says (bug#8738).
+
+2011-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (store_monospaced_changed): Take new font as arg and
+        check for change against current_mono_font.
+        (EMACS_TYPE_SETTINGS): Remove this and related defines.
+        (emacs_settings_constructor, emacs_settings_get_property)
+        (emacs_settings_set_property, emacs_settings_class_init)
+        (emacs_settings_init, gsettings_obj): Remove.
+        (something_changedCB): New function for HAVE_GSETTINGS.
+        (something_changedCB): HAVE_GCONF: Call store_monospaced_changed
+        with value as argument.
+        (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling
+        g_settings_new (Bug#8967).  Do not create gsettings_obj.
+        Remove calls to g_settings_bind.  Connect something_changedCB to
+        "changed".
+
+        * xgselect.c: Add defined (HAVE_GSETTINGS).
+        (xgselect_initialize): Ditto.
+
+        * process.c: Add defined (HAVE_GSETTINGS) for xgselect.h
+        (wait_reading_process_output): Add defined (HAVE_GSETTINGS) for
+        xg_select.
+
+2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * eval.c (struct backtrace): Simplify and port the data structure.
+        Do not assume that "int nargs : BITS_PER_INT - 2;" produces a
+        signed bit field, as this assumption is not portable and it makes
+        Emacs crash when compiled with Sun C 5.8 on sparc.  Do not use
+        "char debug_on_exit : 1" as this is not portable either; instead,
+        use the portable "unsigned int debug_on_exit : 1".  Remove unused
+        member evalargs.  Remove obsolete comments about cc bombing out.
+
+2011-06-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
+        Let HAVE_GSETTINGS override HAVE_GCONF.
+        (store_monospaced_changed): New function.
+        (EMACS_SETTINGS): A new type derived from GObject to handle
+        GSettings notifications.
+        (emacs_settings_constructor, emacs_settings_get_property)
+        (emacs_settings_set_property, emacs_settings_class_init):
+        New functions.
+        (gsettings_client, gsettings_obj): New variables.
+        (GSETTINGS_SCHEMA): New define.
+        (something_changedCB): Call store_monospaced_changed.
+        (init_gsettings): New function.
+        (xsettings_initialize): Call init_gsettings.
+        (syms_of_xsettings): Initialize gsettings_client, gsettings_obj
+        to NULL.
+
+        * Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from
+        GCONF_CFLAGS/LIBS.
+
+2011-06-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (resize_root_window, grow_mini_window)
+        (shrink_mini_window): Rename Qresize_root_window to
+        Qwindow_resize_root_window and Qresize_root_window_vertically to
+        Qwindow_resize_root_window_vertically.
+
+2011-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.
+
+2011-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Redesign dependencies so they reflect more
+        clearly which files are directly included by each source file,
+        and not through other includes.
+
+2011-06-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (Qclone_number): Declare static and DEFSYM it.
+        (sort_overlays, overlay_strings): When an overlay's clone number
+        matches the window's clone number process the overlay even if
+        the overlay's window property doesn't match the current window.
+
+        * window.c (Fwindow_vchild): Rename to Fwindow_top_child.
+        (Fwindow_hchild): Rename to Fwindow_left_child.
+        (Fwindow_next): Rename to Fwindow_next_sibling.
+        (Fwindow_prev): Rename to Fwindow_prev_sibling.
+        (resize_window_check): Rename to window_resize_check.
+        (resize_window_apply): Rename to window_resize_apply.
+        (Fresize_window_apply): Rename to Fwindow_resize_apply.
+        (Fdelete_other_windows_internal, resize_frame_windows)
+        (Fsplit_window_internal, Fdelete_window_internal)
+        (grow_mini_window, shrink_mini_window)
+        (Fresize_mini_window_internal): Fix callers accordingly.
+
+2011-06-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * emacsgtkfixed.h: State that this is only used with Gtk+3.
+        (emacs_fixed_set_min_size): Remove.
+        (emacs_fixed_new): Take frame as argument.
+
+        * emacsgtkfixed.c: State that this is only used with Gtk+3.
+        (_EmacsFixedPrivate): Remove minwidth/height.
+        Add struct frame *f.
+        (emacs_fixed_init): Initialize priv->f.
+        (get_parent_class, emacs_fixed_set_min_size): Remove.
+        (emacs_fixed_new): Set priv->f to argument.
+        (emacs_fixed_get_preferred_width)
+        (emacs_fixed_get_preferred_height): Use min_width/height from
+        frames size_hint to set minimum and natural (Bug#8919).
+        (XSetWMSizeHints, XSetWMNormalHints): Override these functions
+        and use min_width/height from frames size_hint to set
+        min_width/height (Bug#8919).
+
+        * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
+        (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size.
+        Fix indentation.
+
+2011-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
+        bidi_at_paragraph_end, since fast_looking_at doesn't like to be
+        called at ZV.
+
+2011-06-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * process.c (wait_reading_process_output): Bypass select if
+        waiting for a cell while ignoring keyboard input, and input is
+        pending.  Suggested by Jan Djärv (Bug#8869).
+
+2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use gnulib's dup2 module instead of rolling our own.
+        * sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
+
+2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (scrolling_window): Before scrolling, turn off a
+        mouse-highlight in the window being scrolled.
+
+2011-06-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        Move DEFSYM to lisp.h and use everywhere.
+
+        * character.h (DEFSYM): Move declaration...
+        * lisp.h (DEFSYM): ...here.
+
+        * gnutls.c:
+        * minibuf.c:
+        * w32menu.c:
+        * w32proc.c:
+        * w32select.c: Don't include character.h.
+
+        * alloc.c (syms_of_alloc):
+        * buffer.c (syms_of_buffer):
+        * bytecode.c (syms_of_bytecode):
+        * callint.c (syms_of_callint):
+        * casefiddle.c (syms_of_casefiddle):
+        * casetab.c (init_casetab_once):
+        * category.c (init_category_once, syms_of_category):
+        * ccl.c (syms_of_ccl):
+        * cmds.c (syms_of_cmds):
+        * composite.c (syms_of_composite):
+        * dbusbind.c (syms_of_dbusbind):
+        * dired.c (syms_of_dired):
+        * dispnew.c (syms_of_display):
+        * doc.c (syms_of_doc):
+        * editfns.c (syms_of_editfns):
+        * emacs.c (syms_of_emacs):
+        * eval.c (syms_of_eval):
+        * fileio.c (syms_of_fileio):
+        * fns.c (syms_of_fns):
+        * frame.c (syms_of_frame):
+        * fringe.c (syms_of_fringe):
+        * insdel.c (syms_of_insdel):
+        * keymap.c (syms_of_keymap):
+        * lread.c (init_obarray, syms_of_lread):
+        * macros.c (syms_of_macros):
+        * msdos.c (syms_of_msdos):
+        * print.c (syms_of_print):
+        * process.c (syms_of_process):
+        * search.c (syms_of_search):
+        * sound.c (syms_of_sound):
+        * syntax.c (init_syntax_once, syms_of_syntax):
+        * terminal.c (syms_of_terminal):
+        * textprop.c (syms_of_textprop):
+        * undo.c (syms_of_undo):
+        * w32.c (globals_of_w32):
+        * window.c (syms_of_window):
+        * xdisp.c (syms_of_xdisp):
+        * xfaces.c (syms_of_xfaces):
+        * xfns.c (syms_of_xfns):
+        * xmenu.c (syms_of_xmenu):
+        * xsettings.c (syms_of_xsettings):
+        * xterm.c (syms_of_xterm): Use DEFSYM.
+
+2011-06-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnutls.c (syms_of_gnutls): Use the DEFSYM macro from character.h.
+
+2011-06-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Integer and buffer overflow fixes (Bug#8873).
+
+        * print.c (printchar, strout): Check for string overflow.
+        (PRINTPREPARE, printchar, strout):
+        Don't set size unless allocation succeeds.
+
+        * minibuf.c (read_minibuf_noninteractive): Use ptrdiff_t, not int,
+        for sizes.  Check for string overflow more accurately.
+        Simplify newline removal at end; this suppresses a GCC 4.6.0 warning.
+
+        * macros.c: Integer and buffer overflow fixes.
+        * keyboard.h (struct keyboard.kbd_macro_bufsize):
+        * macros.c (Fstart_kbd_macro, store_kbd_macro_char):
+        Use ptrdiff_t, not int, for sizes.
+        Don't increment bufsize until after realloc succeeds.
+        Check for size-calculation overflow.
+        (Fstart_kbd_macro): Use EMACS_INT, not int, for XINT result.
+
+        * lisp.h (DEFVAR_KBOARD): Use offsetof instead of char * finagling.
+
+        * lread.c: Integer overflow fixes.
+        (read_integer): Radix is now EMACS_INT, not int,
+        to improve quality of diagnostics for out-of-range radices.
+        Calculate buffer size correctly for out-of-range radices.
+        (read1): Check for integer overflow in radices, and in
+        read-circle numbers.
+        (read_escape): Avoid int overflow.
+        (Fload, openp, read_buffer_size, read1)
+        (substitute_object_recurse, read_vector, read_list, map_obarray):
+        Use ptrdiff_t, not int, for sizes.
+        (read1): Use EMACS_INT, not int, for sizes.
+        Check for size overflow.
+
+        * image.c (cache_image): Check for size arithmetic overflow.
+
+        * lread.c: Integer overflow issues.
+        (saved_doc_string_size, saved_doc_string_length)
+        (prev_saved_doc_string_size, prev_saved_doc_string_length):
+        Now ptrdiff_t, not int.
+        (read1): Don't assume doc string length fits in int.  Check for
+        out-of-range doc string lengths.
+        (read_list): Don't assume file position fits in int.
+        (read_escape): Check for hex character overflow.
+
+2011-06-22  Leo Liu  <sdl.web@gmail.com>
+
+        * minibuf.c (Fcompleting_read_default, Vcompleting_read_function):
+        Move to minibuffer.el.
+
 2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fixes for GLYPH_DEBUG found by GCC 4.6.0 static checking.
@@ -272,7 +692,7 @@
 
 2011-06-22  Jim Meyering  <meyering@redhat.com>
 
-        don't leak an XBM-image-sized buffer
+        Don't leak an XBM-image-sized buffer
         * image.c (xbm_load): Free the image buffer after using it.
 
 2011-06-21  Paul Eggert  <eggert@cs.ucla.edu>
@@ -292,7 +712,7 @@
 
         * fns.c (secure_hash): Rename from crypto_hash_function and change
         the first arg to accept symbols.
-        (Fsecure_hash): New primtive.
+        (Fsecure_hash): New primitive.
         (syms_of_fns): New symbols.
 
 2011-06-20  Deniz Dogan  <deniz@dogan.se>
@@ -1466,7 +1886,7 @@
         and %.0c.  Fix bug with strchr succeeding on '\0' when looking for
         flags.  Fix bug with (format "%c" 256.0).  Avoid integer overflow when
         formatting out-of-range floating point numbers with int
-        formats. (Bug#8668)
+        formats.  (Bug#8668)
 
         * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN.
 
@@ -2430,9 +2850,9 @@
         :verify-hostname-error, :verify-error, and :verify-flags
         parameters of `gnutls-boot' and documented those parameters in the
         docstring.  Start callback support.
-        (emacs_gnutls_handshake): Add Woe32 support. Retry handshake
-        unless a fatal error occured. Call gnutls_alert_send_appropriate
-        on error. Return error code.
+        (emacs_gnutls_handshake): Add Woe32 support.  Retry handshake
+        unless a fatal error occurred.  Call gnutls_alert_send_appropriate
+        on error.  Return error code.
         (emacs_gnutls_write): Call emacs_gnutls_handle_error.
         (emacs_gnutls_read): Likewise.
         (Fgnutls_boot): Return handshake error code.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 0c39de74a6a..f25434087c1 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -5985,7 +5985,7 @@
         GC_PROTECT_MALLOC_STATE]: New function.
         (PROTECT_MALLOC_STATE): New macro.
         (__malloc_initialize, morecore, _malloc_internal)
-        (_free_internal) _realloc_internal): Use it to make _heapinfo
+        (_free_internal, _realloc_internal): Use it to make _heapinfo
         read-only outside of gmalloc.
 
         * keymap.c: Update copyright.
diff --git a/src/Makefile.in b/src/Makefile.in
index c4250b90633..f628c321f70 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -152,8 +152,8 @@ DBUS_LIBS = @DBUS_LIBS@
 ## dbusbind.o if HAVE_DBUS, else empty.
 DBUS_OBJ = @DBUS_OBJ@
 
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
+SETTINGS_CFLAGS = @SETTINGS_CFLAGS@
+SETTINGS_LIBS = @SETTINGS_LIBS@
 
 ## gtkutil.o if USE_GTK, else empty.
 GTK_OBJ=@GTK_OBJ@
@@ -305,7 +305,7 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \
   $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
   $(C_SWITCH_X_SYSTEM) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
-  $(GCONF_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
+  $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
   $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \
   $(LIBGNUTLS_CFLAGS) \
   $(C_WARNINGS_SWITCH) $(CFLAGS)
@@ -381,7 +381,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
 LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(DBUS_LIBS) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
-   $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(GCONF_LIBS) $(LIBSELINUX_LIBS) \
+   $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
    $(LIBGNUTLS_LIBS) \
    $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)
diff --git a/src/alloc.c b/src/alloc.c
index 69623d103c3..f679787e95c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5619,7 +5619,8 @@ mark_buffer (Lisp_Object buf)
   /* buffer-local Lisp variables start at `undo_list',
      tho only the ones from `name' on are GC'd normally.  */
   for (ptr = &buffer->BUFFER_INTERNAL_FIELD (name);
-       (char *)ptr < (char *)buffer + sizeof (struct buffer);
+       ptr <= &PER_BUFFER_VALUE (buffer,
+                                 PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER));
        ptr++)
     mark_object (*ptr);
 
@@ -6251,8 +6252,7 @@ do hash-consing of the objects allocated to pure space.  */);
   DEFVAR_LISP ("post-gc-hook", Vpost_gc_hook,
                doc: /* Hook run after garbage collection has finished.  */);
   Vpost_gc_hook = Qnil;
-  Qpost_gc_hook = intern_c_string ("post-gc-hook");
-  staticpro (&Qpost_gc_hook);
+  DEFSYM (Qpost_gc_hook, "post-gc-hook");
 
   DEFVAR_LISP ("memory-signal-data", Vmemory_signal_data,
                doc: /* Precomputed `signal' argument for memory-full error.  */);
@@ -6266,11 +6266,8 @@ do hash-consing of the objects allocated to pure space.  */);
                doc: /* Non-nil means Emacs cannot get much more Lisp memory.  */);
   Vmemory_full = Qnil;
 
-  staticpro (&Qgc_cons_threshold);
-  Qgc_cons_threshold = intern_c_string ("gc-cons-threshold");
-
-  staticpro (&Qchar_table_extra_slots);
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
+  DEFSYM (Qgc_cons_threshold, "gc-cons-threshold");
+  DEFSYM (Qchar_table_extra_slots, "char-table-extra-slots");
 
   DEFVAR_LISP ("gc-elapsed", Vgc_elapsed,
                doc: /* Accumulated time elapsed in garbage collections.
diff --git a/src/bidi.c b/src/bidi.c
index 1f3b196d5a4..469afdb3819 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -744,8 +744,6 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
                        || type == LRE || type == LRO));
              type = bidi_get_type (ch, NEUTRAL_DIR))
           {
-            if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
-              break;
             if (bytepos >= ZV_BYTE)
               {
                 /* Pretend there's a paragraph separator at end of
@@ -753,6 +751,8 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p)
                 type = NEUTRAL_B;
                 break;
               }
+            if (type == NEUTRAL_B && bidi_at_paragraph_end (pos, bytepos) >= -1)
+              break;
             /* Fetch next character and advance to get past it.  */
             ch = bidi_fetch_char (bytepos, pos, &disp_pos,
                                   bidi_it->frame_window_p, &ch_len, &nchars);
diff --git a/src/buffer.c b/src/buffer.c
index 238923a2ba0..e2f34d629e9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -471,8 +471,8 @@ clone_per_buffer_values (struct buffer *from, struct buffer *to)
 
   /* buffer-local Lisp variables start at `undo_list',
      tho only the ones from `name' on are GC'd normally.  */
-  for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
-       offset < sizeof *to;
+  for (offset = PER_BUFFER_VAR_OFFSET (FIRST_FIELD_PER_BUFFER);
+       offset <= PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER);
        offset += sizeof (Lisp_Object))
     {
       Lisp_Object obj;
@@ -830,8 +830,8 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too)
 
   /* buffer-local Lisp variables start at `undo_list',
      tho only the ones from `name' on are GC'd normally.  */
-  for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
-       offset < sizeof *b;
+  for (offset = PER_BUFFER_VAR_OFFSET (FIRST_FIELD_PER_BUFFER);
+       offset <= PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER);
        offset += sizeof (Lisp_Object))
     {
       int idx = PER_BUFFER_IDX (offset);
@@ -1055,8 +1055,8 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
 
     /* buffer-local Lisp variables start at `undo_list',
        tho only the ones from `name' on are GC'd normally.  */
-    for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
-         offset < sizeof (struct buffer);
+    for (offset = PER_BUFFER_VAR_OFFSET (FIRST_FIELD_PER_BUFFER);
+         offset <= PER_BUFFER_VAR_OFFSET (LAST_FIELD_PER_BUFFER);
          /* sizeof EMACS_INT == sizeof Lisp_Object */
          offset += (sizeof (EMACS_INT)))
       {
@@ -4056,7 +4056,8 @@ DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
 }
 
 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
-       doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE.  */)
+       doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE.
+VALUE will be returned.*/)
   (Lisp_Object overlay, Lisp_Object prop, Lisp_Object value)
 {
   Lisp_Object tail, buffer;
@@ -5209,39 +5210,26 @@ syms_of_buffer (void)
   staticpro (&Vbuffer_alist);
   staticpro (&Qprotected_field);
   staticpro (&Qpermanent_local);
-  Qpermanent_local_hook = intern_c_string ("permanent-local-hook");
-  staticpro (&Qpermanent_local_hook);
   staticpro (&Qkill_buffer_hook);
-  Qoverlayp = intern_c_string ("overlayp");
-  staticpro (&Qoverlayp);
-  Qevaporate = intern_c_string ("evaporate");
-  staticpro (&Qevaporate);
-  Qmodification_hooks = intern_c_string ("modification-hooks");
-  staticpro (&Qmodification_hooks);
-  Qinsert_in_front_hooks = intern_c_string ("insert-in-front-hooks");
-  staticpro (&Qinsert_in_front_hooks);
-  Qinsert_behind_hooks = intern_c_string ("insert-behind-hooks");
-  staticpro (&Qinsert_behind_hooks);
-  Qget_file_buffer = intern_c_string ("get-file-buffer");
-  staticpro (&Qget_file_buffer);
-  Qpriority = intern_c_string ("priority");
-  staticpro (&Qpriority);
-  Qbefore_string = intern_c_string ("before-string");
-  staticpro (&Qbefore_string);
-  Qafter_string = intern_c_string ("after-string");
-  staticpro (&Qafter_string);
-  Qfirst_change_hook = intern_c_string ("first-change-hook");
-  staticpro (&Qfirst_change_hook);
-  Qbefore_change_functions = intern_c_string ("before-change-functions");
-  staticpro (&Qbefore_change_functions);
-  Qafter_change_functions = intern_c_string ("after-change-functions");
-  staticpro (&Qafter_change_functions);
+
+  DEFSYM (Qpermanent_local_hook, "permanent-local-hook");
+  DEFSYM (Qoverlayp, "overlayp");
+  DEFSYM (Qevaporate, "evaporate");
+  DEFSYM (Qmodification_hooks, "modification-hooks");
+  DEFSYM (Qinsert_in_front_hooks, "insert-in-front-hooks");
+  DEFSYM (Qinsert_behind_hooks, "insert-behind-hooks");
+  DEFSYM (Qget_file_buffer, "get-file-buffer");
+  DEFSYM (Qpriority, "priority");
+  DEFSYM (Qbefore_string, "before-string");
+  DEFSYM (Qafter_string, "after-string");
+  DEFSYM (Qfirst_change_hook, "first-change-hook");
+  DEFSYM (Qbefore_change_functions, "before-change-functions");
+  DEFSYM (Qafter_change_functions, "after-change-functions");
+  DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions");
+
   /* The next one is initialized in init_buffer_once.  */
   staticpro (&Qucs_set_table_for_input);
 
-  Qkill_buffer_query_functions = intern_c_string ("kill-buffer-query-functions");
-  staticpro (&Qkill_buffer_query_functions);
-
   Fput (Qprotected_field, Qerror_conditions,
         pure_cons (Qprotected_field, pure_cons (Qerror, Qnil)));
   Fput (Qprotected_field, Qerror_message,
@@ -6035,8 +6023,7 @@ If any of them returns nil, the buffer is not killed.  */);
                doc: /* Normal hook run before changing the major mode of a buffer.
 The function `kill-all-local-variables' runs this before doing anything else.  */);
   Vchange_major_mode_hook = Qnil;
-  Qchange_major_mode_hook = intern_c_string ("change-major-mode-hook");
-  staticpro (&Qchange_major_mode_hook);
+  DEFSYM (Qchange_major_mode_hook, "change-major-mode-hook");
 
   DEFVAR_LISP ("buffer-list-update-hook", Vbuffer_list_update_hook,
                doc: /* Hook run when the buffer list changes.
@@ -6044,8 +6031,7 @@ Functions running this hook are `get-buffer-create',
 `make-indirect-buffer', `rename-buffer', `kill-buffer',
 `record-buffer' and `unrecord-buffer'.  */);
   Vbuffer_list_update_hook = Qnil;
-  Qbuffer_list_update_hook = intern_c_string ("buffer-list-update-hook");
-  staticpro (&Qbuffer_list_update_hook);
+  DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook");
 
   defsubr (&Sbuffer_live_p);
   defsubr (&Sbuffer_list);
diff --git a/src/buffer.h b/src/buffer.h
index 4643e0d9d0e..06864dd5789 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -612,6 +612,7 @@ struct buffer
   /* Everything from here down must be a Lisp_Object.  */
   /* buffer-local Lisp variables start at `undo_list',
      tho only the ones from `name' on are GC'd normally.  */
+  #define FIRST_FIELD_PER_BUFFER undo_list
 
   /* Changes in the buffer are recorded here for undo.
      t means don't record anything.
@@ -846,6 +847,9 @@ struct buffer
      t means to use hollow box cursor.
      See `cursor-type' for other values.  */
   Lisp_Object BUFFER_INTERNAL_FIELD (cursor_in_non_selected_windows);
+
+  /* This must be the last field in the above list.  */
+  #define LAST_FIELD_PER_BUFFER cursor_in_non_selected_windows
 };
 
 
diff --git a/src/bytecode.c b/src/bytecode.c
index 58b26c79b84..9ed29e94b54 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1840,8 +1840,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 void
 syms_of_bytecode (void)
 {
-  Qbytecode = intern_c_string ("byte-code");
-  staticpro (&Qbytecode);
+  DEFSYM (Qbytecode, "byte-code");
 
   defsubr (&Sbyte_code);
 
@@ -1863,8 +1862,7 @@ integer, it is incremented each time that symbol's function is called.  */);
 
   byte_metering_on = 0;
   Vbyte_code_meter = Fmake_vector (make_number (256), make_number (0));
-  Qbyte_code_meter = intern_c_string ("byte-code-meter");
-  staticpro (&Qbyte_code_meter);
+  DEFSYM (Qbyte_code_meter, "byte-code-meter");
   {
     int i = 256;
     while (i--)
diff --git a/src/callint.c b/src/callint.c
index dc5e6a4c37a..1371b403e4b 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -105,9 +105,10 @@ Z -- Coding system, nil if no prefix arg.
 
 In addition, if the string begins with `*', an error is signaled if
   the buffer is read-only.
-If the string begins with `@', Emacs searches the key sequence which
- invoked the command for its first mouse click (or any other event
- which specifies a window).
+If `@' appears at the beginning of the string, and if the key sequence
+ used to invoke the command includes any mouse events, then the window
+ associated with the first of those events is selected before the
+ command is run.
 If the string begins with `^' and `shift-select-mode' is non-nil,
  Emacs first calls the function `handle-shift-selection'.
 You may use `@', `*', and `^' together.  They are processed in the
@@ -896,41 +897,20 @@ syms_of_callint (void)
                                 pure_cons (intern_c_string ("point"),
                                        pure_cons (intern_c_string ("mark"), Qnil))));
 
-  Qlist = intern_c_string ("list");
-  staticpro (&Qlist);
-  Qlet = intern_c_string ("let");
-  staticpro (&Qlet);
-  Qif = intern_c_string ("if");
-  staticpro (&Qif);
-  Qwhen = intern_c_string ("when");
-  staticpro (&Qwhen);
-  Qletx = intern_c_string ("let*");
-  staticpro (&Qletx);
-  Qsave_excursion = intern_c_string ("save-excursion");
-  staticpro (&Qsave_excursion);
-  Qprogn = intern_c_string ("progn");
-  staticpro (&Qprogn);
-
-  Qminus = intern_c_string ("-");
-  staticpro (&Qminus);
-
-  Qplus = intern_c_string ("+");
-  staticpro (&Qplus);
-
-  Qhandle_shift_selection = intern_c_string ("handle-shift-selection");
-  staticpro (&Qhandle_shift_selection);
-
-  Qcall_interactively = intern_c_string ("call-interactively");
-  staticpro (&Qcall_interactively);
-
-  Qcommand_debug_status = intern_c_string ("command-debug-status");
-  staticpro (&Qcommand_debug_status);
-
-  Qenable_recursive_minibuffers = intern_c_string ("enable-recursive-minibuffers");
-  staticpro (&Qenable_recursive_minibuffers);
-
-  Qmouse_leave_buffer_hook = intern_c_string ("mouse-leave-buffer-hook");
-  staticpro (&Qmouse_leave_buffer_hook);
+  DEFSYM (Qlist, "list");
+  DEFSYM (Qlet, "let");
+  DEFSYM (Qif, "if");
+  DEFSYM (Qwhen, "when");
+  DEFSYM (Qletx, "let*");
+  DEFSYM (Qsave_excursion, "save-excursion");
+  DEFSYM (Qprogn, "progn");
+  DEFSYM (Qminus, "-");
+  DEFSYM (Qplus, "+");
+  DEFSYM (Qhandle_shift_selection, "handle-shift-selection");
+  DEFSYM (Qcall_interactively, "call-interactively");
+  DEFSYM (Qcommand_debug_status, "command-debug-status");
+  DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
+  DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook");
 
   DEFVAR_KBOARD ("prefix-arg", Vprefix_arg,
                  doc: /* The value of the prefix argument for the next editing command.
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 1a0a62f273c..50ad4eeda74 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -417,8 +417,7 @@ With negative argument, capitalize previous words but do not move.  */)
 void
 syms_of_casefiddle (void)
 {
-  Qidentity = intern_c_string ("identity");
-  staticpro (&Qidentity);
+  DEFSYM (Qidentity, "identity");
   defsubr (&Supcase);
   defsubr (&Sdowncase);
   defsubr (&Scapitalize);
diff --git a/src/casetab.c b/src/casetab.c
index 29120dd08ce..3433b313c03 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -244,8 +244,7 @@ init_casetab_once (void)
 {
   register int i;
   Lisp_Object down, up;
-  Qcase_table = intern_c_string ("case-table");
-  staticpro (&Qcase_table);
+  DEFSYM (Qcase_table, "case-table");
 
   /* Intern this now in case it isn't already done.
      Setting this variable twice is harmless.
@@ -288,8 +287,7 @@ init_casetab_once (void)
 void
 syms_of_casetab (void)
 {
-  Qcase_table_p = intern_c_string ("case-table-p");
-  staticpro (&Qcase_table_p);
+  DEFSYM (Qcase_table_p, "case-table-p");
 
   staticpro (&Vascii_canon_table);
   staticpro (&Vascii_downcase_table);
diff --git a/src/category.c b/src/category.c
index 23fd874c824..08eadb04730 100644
--- a/src/category.c
+++ b/src/category.c
@@ -453,8 +453,7 @@ void
 init_category_once (void)
 {
   /* This has to be done here, before we call Fmake_char_table.  */
-  Qcategory_table = intern_c_string ("category-table");
-  staticpro (&Qcategory_table);
+  DEFSYM (Qcategory_table, "category-table");
 
   /* Intern this now in case it isn't already done.
      Setting this variable twice is harmless.
@@ -475,12 +474,9 @@ init_category_once (void)
 void
 syms_of_category (void)
 {
-  Qcategoryp = intern_c_string ("categoryp");
-  staticpro (&Qcategoryp);
-  Qcategorysetp = intern_c_string ("categorysetp");
-  staticpro (&Qcategorysetp);
-  Qcategory_table_p = intern_c_string ("category-table-p");
-  staticpro (&Qcategory_table_p);
+  DEFSYM (Qcategoryp, "categoryp");
+  DEFSYM (Qcategorysetp, "categorysetp");
+  DEFSYM (Qcategory_table_p, "category-table-p");
 
   DEFVAR_LISP ("word-combining-categories", Vword_combining_categories,
                doc: /* List of pair (cons) of categories to determine word boundary.
diff --git a/src/ccl.c b/src/ccl.c
index 30d151f00a0..9cfcbfe8703 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2305,23 +2305,12 @@ syms_of_ccl (void)
   staticpro (&Vccl_program_table);
   Vccl_program_table = Fmake_vector (make_number (32), Qnil);
 
-  Qccl = intern_c_string ("ccl");
-  staticpro (&Qccl);
-
-  Qcclp = intern_c_string ("cclp");
-  staticpro (&Qcclp);
-
-  Qccl_program = intern_c_string ("ccl-program");
-  staticpro (&Qccl_program);
-
-  Qccl_program_idx = intern_c_string ("ccl-program-idx");
-  staticpro (&Qccl_program_idx);
-
-  Qcode_conversion_map = intern_c_string ("code-conversion-map");
-  staticpro (&Qcode_conversion_map);
-
-  Qcode_conversion_map_id = intern_c_string ("code-conversion-map-id");
-  staticpro (&Qcode_conversion_map_id);
+  DEFSYM (Qccl, "ccl");
+  DEFSYM (Qcclp, "cclp");
+  DEFSYM (Qccl_program, "ccl-program");
+  DEFSYM (Qccl_program_idx, "ccl-program-idx");
+  DEFSYM (Qcode_conversion_map, "code-conversion-map");
+  DEFSYM (Qcode_conversion_map_id, "code-conversion-map-id");
 
   DEFVAR_LISP ("code-conversion-map-vector", Vcode_conversion_map_vector,
                doc: /* Vector of code conversion maps.  */);
diff --git a/src/character.h b/src/character.h
index d8e77c50953..063b5147dc9 100644
--- a/src/character.h
+++ b/src/character.h
@@ -667,7 +667,4 @@ extern Lisp_Object string_escape_byte8 (Lisp_Object);
 #define GET_TRANSLATION_TABLE(id) \
   (XCDR(XVECTOR(Vtranslation_table_vector)->contents[(id)]))
 
-#define DEFSYM(sym, name)       \
-  do { (sym) = intern_c_string ((name)); staticpro (&(sym)); } while (0)
-
 #endif /* EMACS_CHARACTER_H */
diff --git a/src/cmds.c b/src/cmds.c
index 5dc4d2bfe30..f49cfc221be 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -511,20 +511,11 @@ internal_self_insert (int c, EMACS_INT n)
 void
 syms_of_cmds (void)
 {
-  Qkill_backward_chars = intern_c_string ("kill-backward-chars");
-  staticpro (&Qkill_backward_chars);
-
-  Qkill_forward_chars = intern_c_string ("kill-forward-chars");
-  staticpro (&Qkill_forward_chars);
-
-  Qoverwrite_mode_binary = intern_c_string ("overwrite-mode-binary");
-  staticpro (&Qoverwrite_mode_binary);
-
-  Qexpand_abbrev = intern_c_string ("expand-abbrev");
-  staticpro (&Qexpand_abbrev);
-
-  Qpost_self_insert_hook = intern_c_string ("post-self-insert-hook");
-  staticpro (&Qpost_self_insert_hook);
+  DEFSYM (Qkill_backward_chars, "kill-backward-chars");
+  DEFSYM (Qkill_forward_chars, "kill-forward-chars");
+  DEFSYM (Qoverwrite_mode_binary, "overwrite-mode-binary");
+  DEFSYM (Qexpand_abbrev, "expand-abbrev");
+  DEFSYM (Qpost_self_insert_hook, "post-self-insert-hook");
 
   DEFVAR_LISP ("post-self-insert-hook", Vpost_self_insert_hook,
                doc: /* Hook run at the end of `self-insert-command'.
diff --git a/src/coding.c b/src/coding.c
index 9939774ea82..65c8a767c2b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9000,7 +9000,7 @@ not fully specified.)  */)
   (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer)
 {
   return code_convert_string (string, coding_system, buffer,
-                              1, ! NILP (nocopy), 1);
+                              1, ! NILP (nocopy), 0);
 }
 
 
diff --git a/src/composite.c b/src/composite.c
index 7123b505e68..577640f6fb7 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1936,8 +1936,7 @@ syms_of_composite (void)
 {
   int i;
 
-  Qcomposition = intern_c_string ("composition");
-  staticpro (&Qcomposition);
+  DEFSYM (Qcomposition, "composition");
 
   /* Make a hash table for static composition.  */
   {
@@ -1996,11 +1995,8 @@ valid.
 The default value is the function `compose-chars-after'.  */);
   Vcompose_chars_after_function = intern_c_string ("compose-chars-after");
 
-  Qauto_composed = intern_c_string ("auto-composed");
-  staticpro (&Qauto_composed);
-
-  Qauto_composition_function = intern_c_string ("auto-composition-function");
-  staticpro (&Qauto_composition_function);
+  DEFSYM (Qauto_composed, "auto-composed");
+  DEFSYM (Qauto_composition_function, "auto-composition-function");
 
   DEFVAR_LISP ("auto-composition-mode", Vauto_composition_mode,
                doc: /* Non-nil if Auto-Composition mode is enabled.
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 302b93146fd..4828f4e968d 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2189,142 +2189,76 @@ void
 syms_of_dbusbind (void)
 {
 
-  Qdbus_init_bus = intern_c_string ("dbus-init-bus");
-  staticpro (&Qdbus_init_bus);
+  DEFSYM (Qdbus_init_bus, "dbus-init-bus");
   defsubr (&Sdbus_init_bus);
 
-  Qdbus_close_bus = intern_c_string ("dbus-close-bus");
-  staticpro (&Qdbus_close_bus);
+  DEFSYM (Qdbus_close_bus, "dbus-close-bus");
   defsubr (&Sdbus_close_bus);
 
-  Qdbus_get_unique_name = intern_c_string ("dbus-get-unique-name");
-  staticpro (&Qdbus_get_unique_name);
+  DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name");
   defsubr (&Sdbus_get_unique_name);
 
-  Qdbus_call_method = intern_c_string ("dbus-call-method");
-  staticpro (&Qdbus_call_method);
+  DEFSYM (Qdbus_call_method, "dbus-call-method");
   defsubr (&Sdbus_call_method);
 
-  Qdbus_call_method_asynchronously
-    = intern_c_string ("dbus-call-method-asynchronously");
-  staticpro (&Qdbus_call_method_asynchronously);
+  DEFSYM (Qdbus_call_method_asynchronously, "dbus-call-method-asynchronously");
   defsubr (&Sdbus_call_method_asynchronously);
 
-  Qdbus_method_return_internal
-    = intern_c_string ("dbus-method-return-internal");
-  staticpro (&Qdbus_method_return_internal);
+  DEFSYM (Qdbus_method_return_internal, "dbus-method-return-internal");
   defsubr (&Sdbus_method_return_internal);
 
-  Qdbus_method_error_internal = intern_c_string ("dbus-method-error-internal");
-  staticpro (&Qdbus_method_error_internal);
+  DEFSYM (Qdbus_method_error_internal, "dbus-method-error-internal");
   defsubr (&Sdbus_method_error_internal);
 
-  Qdbus_send_signal = intern_c_string ("dbus-send-signal");
-  staticpro (&Qdbus_send_signal);
+  DEFSYM (Qdbus_send_signal, "dbus-send-signal");
   defsubr (&Sdbus_send_signal);
 
-  Qdbus_register_service = intern_c_string ("dbus-register-service");
-  staticpro (&Qdbus_register_service);
+  DEFSYM (Qdbus_register_service, "dbus-register-service");
   defsubr (&Sdbus_register_service);
 
-  Qdbus_register_signal = intern_c_string ("dbus-register-signal");
-  staticpro (&Qdbus_register_signal);
+  DEFSYM (Qdbus_register_signal, "dbus-register-signal");
   defsubr (&Sdbus_register_signal);
 
-  Qdbus_register_method = intern_c_string ("dbus-register-method");
-  staticpro (&Qdbus_register_method);
+  DEFSYM (Qdbus_register_method, "dbus-register-method");
   defsubr (&Sdbus_register_method);
 
-  Qdbus_error = intern_c_string ("dbus-error");
-  staticpro (&Qdbus_error);
+  DEFSYM (Qdbus_error, "dbus-error");
   Fput (Qdbus_error, Qerror_conditions,
         list2 (Qdbus_error, Qerror));
   Fput (Qdbus_error, Qerror_message,
         make_pure_c_string ("D-Bus error"));
 
-  QCdbus_system_bus = intern_c_string (":system");
-  staticpro (&QCdbus_system_bus);
-
-  QCdbus_session_bus = intern_c_string (":session");
-  staticpro (&QCdbus_session_bus);
-
-  QCdbus_request_name_allow_replacement
-    = intern_c_string (":allow-replacement");
-  staticpro (&QCdbus_request_name_allow_replacement);
-
-  QCdbus_request_name_replace_existing = intern_c_string (":replace-existing");
-  staticpro (&QCdbus_request_name_replace_existing);
-
-  QCdbus_request_name_do_not_queue = intern_c_string (":do-not-queue");
-  staticpro (&QCdbus_request_name_do_not_queue);
-
-  QCdbus_request_name_reply_primary_owner = intern_c_string (":primary-owner");
-  staticpro (&QCdbus_request_name_reply_primary_owner);
-
-  QCdbus_request_name_reply_exists = intern_c_string (":exists");
-  staticpro (&QCdbus_request_name_reply_exists);
-
-  QCdbus_request_name_reply_in_queue = intern_c_string (":in-queue");
-  staticpro (&QCdbus_request_name_reply_in_queue);
-
-  QCdbus_request_name_reply_already_owner = intern_c_string (":already-owner");
-  staticpro (&QCdbus_request_name_reply_already_owner);
-
-  QCdbus_timeout = intern_c_string (":timeout");
-  staticpro (&QCdbus_timeout);
-
-  QCdbus_type_byte = intern_c_string (":byte");
-  staticpro (&QCdbus_type_byte);
-
-  QCdbus_type_boolean = intern_c_string (":boolean");
-  staticpro (&QCdbus_type_boolean);
-
-  QCdbus_type_int16 = intern_c_string (":int16");
-  staticpro (&QCdbus_type_int16);
-
-  QCdbus_type_uint16 = intern_c_string (":uint16");
-  staticpro (&QCdbus_type_uint16);
-
-  QCdbus_type_int32 = intern_c_string (":int32");
-  staticpro (&QCdbus_type_int32);
-
-  QCdbus_type_uint32 = intern_c_string (":uint32");
-  staticpro (&QCdbus_type_uint32);
-
-  QCdbus_type_int64 = intern_c_string (":int64");
-  staticpro (&QCdbus_type_int64);
-
-  QCdbus_type_uint64 = intern_c_string (":uint64");
-  staticpro (&QCdbus_type_uint64);
-
-  QCdbus_type_double = intern_c_string (":double");
-  staticpro (&QCdbus_type_double);
-
-  QCdbus_type_string = intern_c_string (":string");
-  staticpro (&QCdbus_type_string);
-
-  QCdbus_type_object_path = intern_c_string (":object-path");
-  staticpro (&QCdbus_type_object_path);
-
-  QCdbus_type_signature = intern_c_string (":signature");
-  staticpro (&QCdbus_type_signature);
+  DEFSYM (QCdbus_system_bus, ":system");
+  DEFSYM (QCdbus_session_bus, ":session");
+  DEFSYM (QCdbus_request_name_allow_replacement, ":allow-replacement");
+  DEFSYM (QCdbus_request_name_replace_existing, ":replace-existing");
+  DEFSYM (QCdbus_request_name_do_not_queue, ":do-not-queue");
+  DEFSYM (QCdbus_request_name_reply_primary_owner, ":primary-owner");
+  DEFSYM (QCdbus_request_name_reply_exists, ":exists");
+  DEFSYM (QCdbus_request_name_reply_in_queue, ":in-queue");
+  DEFSYM (QCdbus_request_name_reply_already_owner, ":already-owner");
+  DEFSYM (QCdbus_timeout, ":timeout");
+  DEFSYM (QCdbus_type_byte, ":byte");
+  DEFSYM (QCdbus_type_boolean, ":boolean");
+  DEFSYM (QCdbus_type_int16, ":int16");
+  DEFSYM (QCdbus_type_uint16, ":uint16");
+  DEFSYM (QCdbus_type_int32, ":int32");
+  DEFSYM (QCdbus_type_uint32, ":uint32");
+  DEFSYM (QCdbus_type_int64, ":int64");
+  DEFSYM (QCdbus_type_uint64, ":uint64");
+  DEFSYM (QCdbus_type_double, ":double");
+  DEFSYM (QCdbus_type_string, ":string");
+  DEFSYM (QCdbus_type_object_path, ":object-path");
+  DEFSYM (QCdbus_type_signature, ":signature");
 
 #ifdef DBUS_TYPE_UNIX_FD
-  QCdbus_type_unix_fd = intern_c_string (":unix-fd");
-  staticpro (&QCdbus_type_unix_fd);
+  DEFSYM (QCdbus_type_unix_fd, ":unix-fd");
 #endif
 
-  QCdbus_type_array = intern_c_string (":array");
-  staticpro (&QCdbus_type_array);
-
-  QCdbus_type_variant = intern_c_string (":variant");
-  staticpro (&QCdbus_type_variant);
-
-  QCdbus_type_struct = intern_c_string (":struct");
-  staticpro (&QCdbus_type_struct);
-
-  QCdbus_type_dict_entry = intern_c_string (":dict-entry");
-  staticpro (&QCdbus_type_dict_entry);
+  DEFSYM (QCdbus_type_array, ":array");
+  DEFSYM (QCdbus_type_variant, ":variant");
+  DEFSYM (QCdbus_type_struct, ":struct");
+  DEFSYM (QCdbus_type_dict_entry, ":dict-entry");
 
   DEFVAR_LISP ("dbus-registered-buses",
                Vdbus_registered_buses,
diff --git a/src/dired.c b/src/dired.c
index 3ab1ba8a900..415f9ac5ae5 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1017,21 +1017,13 @@ Comparison is in lexicographic order and case is significant.  */)
 void
 syms_of_dired (void)
 {
-  Qdirectory_files = intern_c_string ("directory-files");
-  Qdirectory_files_and_attributes = intern_c_string ("directory-files-and-attributes");
-  Qfile_name_completion = intern_c_string ("file-name-completion");
-  Qfile_name_all_completions = intern_c_string ("file-name-all-completions");
-  Qfile_attributes = intern_c_string ("file-attributes");
-  Qfile_attributes_lessp = intern_c_string ("file-attributes-lessp");
-  Qdefault_directory = intern_c_string ("default-directory");
-
-  staticpro (&Qdirectory_files);
-  staticpro (&Qdirectory_files_and_attributes);
-  staticpro (&Qfile_name_completion);
-  staticpro (&Qfile_name_all_completions);
-  staticpro (&Qfile_attributes);
-  staticpro (&Qfile_attributes_lessp);
-  staticpro (&Qdefault_directory);
+  DEFSYM (Qdirectory_files, "directory-files");
+  DEFSYM (Qdirectory_files_and_attributes, "directory-files-and-attributes");
+  DEFSYM (Qfile_name_completion, "file-name-completion");
+  DEFSYM (Qfile_name_all_completions, "file-name-all-completions");
+  DEFSYM (Qfile_attributes, "file-attributes");
+  DEFSYM (Qfile_attributes_lessp, "file-attributes-lessp");
+  DEFSYM (Qdefault_directory, "default-directory");
 
   defsubr (&Sdirectory_files);
   defsubr (&Sdirectory_files_and_attributes);
diff --git a/src/dispnew.c b/src/dispnew.c
index 21df105971b..8691c921853 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4543,6 +4543,7 @@ scrolling_window (struct window *w, int header_line_p)
         /* Copy on the display.  */
         if (r->current_y != r->desired_y)
           {
+            rif->clear_window_mouse_face (w);
             rif->scroll_run_hook (w, r);
 
             /* Invalidate runs that copy from where we copied to.  */
@@ -6438,10 +6439,8 @@ syms_of_display (void)
   frame_and_buffer_state = Fmake_vector (make_number (20), Qlambda);
   staticpro (&frame_and_buffer_state);
 
-  Qdisplay_table = intern_c_string ("display-table");
-  staticpro (&Qdisplay_table);
-  Qredisplay_dont_pause = intern_c_string ("redisplay-dont-pause");
-  staticpro (&Qredisplay_dont_pause);
+  DEFSYM (Qdisplay_table, "display-table");
+  DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
 
   DEFVAR_INT ("baud-rate", baud_rate,
               doc: /* *The output baud rate of the terminal.
diff --git a/src/doc.c b/src/doc.c
index 48e0936510b..69646f5af51 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -945,8 +945,7 @@ a new string, without any text properties, is returned.  */)
 void
 syms_of_doc (void)
 {
-  Qfunction_documentation = intern_c_string ("function-documentation");
-  staticpro (&Qfunction_documentation);
+  DEFSYM (Qfunction_documentation, "function-documentation");
 
   DEFVAR_LISP ("internal-doc-file-name", Vdoc_file_name,
                doc: /* Name of file containing documentation strings of built-in symbols.  */);
diff --git a/src/editfns.c b/src/editfns.c
index c0c0e530265..bb36d0dee71 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1700,7 +1700,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
   (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)
 {
   time_t value;
-  int size;
+  ptrdiff_t size;
   int usec;
   int ns;
   struct tm *tm;
@@ -1717,7 +1717,9 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
                                                 Vlocale_coding_system, 1);
 
   /* This is probably enough.  */
-  size = SBYTES (format_string) * 6 + 50;
+  size = SBYTES (format_string);
+  if (size <= (STRING_BYTES_BOUND - 50) / 6)
+    size = size * 6 + 50;
 
   BLOCK_INPUT;
   tm = ut ? gmtime (&value) : localtime (&value);
@@ -1730,7 +1732,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
   while (1)
     {
       char *buf = (char *) alloca (size + 1);
-      int result;
+      size_t result;
 
       buf[0] = '\1';
       BLOCK_INPUT;
@@ -1749,6 +1751,8 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
                                 SBYTES (format_string),
                                 tm, ut, ns);
       UNBLOCK_INPUT;
+      if (STRING_BYTES_BOUND <= result)
+        string_overflow ();
       size = result + 1;
     }
 }
@@ -3557,7 +3561,8 @@ The width specifier supplies a lower limit for the length of the
 printed representation.  The padding, if any, normally goes on the
 left, but it goes on the right if the - flag is present.  The padding
 character is normally a space, but it is 0 if the 0 flag is present.
-The - flag takes precedence over the 0 flag.
+The 0 flag is ignored if the - flag is present, or the format sequence
+is something other than %d, %e, %f, and %g.
 
 For %e, %f, and %g sequences, the number after the "." in the
 precision specifier says how many decimal places to show; if zero, the
@@ -4738,9 +4743,7 @@ syms_of_editfns (void)
   environbuf = 0;
   initial_tz = 0;
 
-  Qbuffer_access_fontify_functions
-    = intern_c_string ("buffer-access-fontify-functions");
-  staticpro (&Qbuffer_access_fontify_functions);
+  DEFSYM (Qbuffer_access_fontify_functions, "buffer-access-fontify-functions");
 
   DEFVAR_LISP ("inhibit-field-text-motion", Vinhibit_field_text_motion,
                doc: /* Non-nil means text motion commands don't notice fields.  */);
@@ -4802,10 +4805,8 @@ functions if all the text being accessed has this property.  */);
   defsubr (&Sregion_beginning);
   defsubr (&Sregion_end);
 
-  staticpro (&Qfield);
-  Qfield = intern_c_string ("field");
-  staticpro (&Qboundary);
-  Qboundary = intern_c_string ("boundary");
+  DEFSYM (Qfield, "field");
+  DEFSYM (Qboundary, "boundary");
   defsubr (&Sfield_beginning);
   defsubr (&Sfield_end);
   defsubr (&Sfield_string);
diff --git a/src/emacs.c b/src/emacs.c
index c4b4caad9b5..e4b3a68a6c1 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2375,10 +2375,8 @@ from the parent process and its tty file descriptors.  */)
 void
 syms_of_emacs (void)
 {
-  Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist");
-  staticpro (&Qfile_name_handler_alist);
-  Qrisky_local_variable = intern_c_string ("risky-local-variable");
-  staticpro (&Qrisky_local_variable);
+  DEFSYM (Qfile_name_handler_alist, "file-name-handler-alist");
+  DEFSYM (Qrisky_local_variable, "risky-local-variable");
 
 #ifndef CANNOT_DUMP
   defsubr (&Sdump_emacs);
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index fe3514bce93..0b57e2cdf36 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,4 +1,5 @@
 /* A Gtk Widget that inherits GtkFixed, but can be shrinked. 
+This file is only use when compiling with Gtk+ 3.
 
 Copyright (C) 2011  Free Software Foundation, Inc.
 
@@ -17,12 +18,19 @@ 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/>.  */
 
-#include "emacsgtkfixed.h"
+#include <config.h>
 
+#include "emacsgtkfixed.h"
+#include <signal.h>
+#include <stdio.h>
+#include <setjmp.h>
+#include "lisp.h"
+#include "frame.h"
+#include "xterm.h"
 
 struct _EmacsFixedPrivate
 {
-  int minwidth, minheight;
+  struct frame *f;
 };
 
 
@@ -59,7 +67,7 @@ emacs_fixed_init (EmacsFixed *fixed)
 {
   fixed->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixed, EMACS_TYPE_FIXED,
                                              EmacsFixedPrivate);
-  fixed->priv->minwidth = fixed->priv->minheight = 0;
+  fixed->priv->f = 0;
 }
 
 /**
@@ -70,17 +78,12 @@ emacs_fixed_init (EmacsFixed *fixed)
  * Returns: a new #EmacsFixed.
  */
 GtkWidget*
-emacs_fixed_new (void)
-{
-  return g_object_new (EMACS_TYPE_FIXED, NULL);
-}
-
-static GtkWidgetClass *
-get_parent_class (EmacsFixed *fixed)
+emacs_fixed_new (struct frame *f)
 {
-  EmacsFixedClass *klass = EMACS_FIXED_GET_CLASS (fixed);
-  GtkFixedClass *parent_class = g_type_class_peek_parent (klass);
-  return (GtkWidgetClass*) parent_class;
+  EmacsFixed *fixed = g_object_new (EMACS_TYPE_FIXED, NULL);
+  EmacsFixedPrivate *priv = fixed->priv;
+  priv->f = f;
+  return GTK_WIDGET (fixed);
 }
 
 static void
@@ -90,9 +93,9 @@ emacs_fixed_get_preferred_width (GtkWidget *widget,
 {
   EmacsFixed *fixed = EMACS_FIXED (widget);
   EmacsFixedPrivate *priv = fixed->priv;
-  GtkWidgetClass *widget_class = get_parent_class (fixed);
-  widget_class->get_preferred_width (widget, minimum, natural);
-  if (minimum) *minimum = priv->minwidth;
+  int w = priv->f->output_data.x->size_hints.min_width;
+  if (minimum) *minimum = w;
+  if (natural) *natural = w;
 }
 
 static void
@@ -102,22 +105,62 @@ emacs_fixed_get_preferred_height (GtkWidget *widget,
 {
   EmacsFixed *fixed = EMACS_FIXED (widget);
   EmacsFixedPrivate *priv = fixed->priv;
-  GtkWidgetClass *widget_class = get_parent_class (fixed);
-  widget_class->get_preferred_height (widget, minimum, natural);
-  if (minimum) *minimum = priv->minheight;
+  int h = priv->f->output_data.x->size_hints.min_height;
+  if (minimum) *minimum = h;
+  if (natural) *natural = h;
 }
 
+
+/* Override the X function so we can intercept Gtk+ 3 calls.
+   Use our values for min_width/height so that KDE don't freak out
+   (Bug#8919), and so users can resize our frames as they wish.  */
+
 void
-emacs_fixed_set_min_size (EmacsFixed *widget, int width, int height)
+XSetWMSizeHints(Display* d,
+                Window w,
+                XSizeHints* hints,
+                Atom prop)
 {
-  EmacsFixedPrivate *priv = widget->priv;
-  GtkWidgetClass *widget_class = get_parent_class (widget);
-  int mw, nw, mh, nh;
-
-  widget_class->get_preferred_height (GTK_WIDGET (widget), &mh, &nh);
-  widget_class->get_preferred_width (GTK_WIDGET (widget), &mw, &nw);
+  struct x_display_info *dpyinfo = x_display_info_for_display (d);
+  struct frame *f = x_top_window_to_frame (dpyinfo, w);
+  long data[18];
+  data[0] = hints->flags;
+  data[1] = hints->x;
+  data[2] = hints->y;
+  data[3] = hints->width;
+  data[4] = hints->height;
+  data[5] = hints->min_width;
+  data[6] = hints->min_height;
+  data[7] = hints->max_width;
+  data[8] = hints->max_height;
+  data[9] = hints->width_inc;
+  data[10] = hints->height_inc;
+  data[11] = hints->min_aspect.x;
+  data[12] = hints->min_aspect.y;
+  data[13] = hints->max_aspect.x;
+  data[14] = hints->max_aspect.y;
+  data[15] = hints->base_width;
+  data[16] = hints->base_height;
+  data[17] = hints->win_gravity;
+
+  if ((hints->flags & PMinSize) && f)
+    {
+      int w = f->output_data.x->size_hints.min_width;
+      int h = f->output_data.x->size_hints.min_height;
+      data[5] = w;
+      data[6] = h;
+    }
+
+  XChangeProperty (d, w, prop, XA_WM_SIZE_HINTS, 32, PropModeReplace,
+                   (unsigned char *) data, 18);
+}
 
-  /* Gtk complains if min size is less than natural size.  */
-  if (width <= nw) priv->minwidth = width;
-  if (height <= nh) priv->minheight = height;
+/* Override this X11 function.
+   This function is in the same X11 file as the one above.  So we must
+   provide it also.  */
+   
+void
+XSetWMNormalHints (Display *d, Window w, XSizeHints *hints)
+{
+  XSetWMSizeHints (d, w, hints, XA_WM_NORMAL_HINTS);
 }
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 405374373ec..dbac136bd7f 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -1,4 +1,5 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 
+/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
+This file is only use when compiling with Gtk+ 3.
 
 Copyright (C) 2011  Free Software Foundation, Inc.
 
@@ -24,6 +25,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 G_BEGIN_DECLS
 
+struct frame;
+
 #define EMACS_TYPE_FIXED                  (emacs_fixed_get_type ())
 #define EMACS_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed))
 #define EMACS_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass))
@@ -49,8 +52,7 @@ struct _EmacsFixedClass
   GtkFixedClass parent_class;
 };
 
-extern GtkWidget *emacs_fixed_new (void);
-extern void emacs_fixed_set_min_size (EmacsFixed *widget, int width, int height);
+extern GtkWidget *emacs_fixed_new (struct frame *f);
 extern GType emacs_fixed_get_type (void);
 
 G_END_DECLS
diff --git a/src/eval.c b/src/eval.c
index be582775fea..90d0df61858 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -32,25 +32,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #endif
 
-/* This definition is duplicated in alloc.c and keyboard.c.  */
-/* Putting it in lisp.h makes cc bomb out!  */
-
 struct backtrace
 {
   struct backtrace *next;
   Lisp_Object *function;
   Lisp_Object *args;    /* Points to vector of args.  */
-#define NARGS_BITS (BITS_PER_INT - 2)
-  /* Let's not use size_t because we want to allow negative values (for
-     UNEVALLED).  Also let's steal 2 bits so we save a word (or more for
-     alignment).  In any case I doubt Emacs would survive a function call with
-     more than 500M arguments.  */
-  int nargs : NARGS_BITS; /* Length of vector.
-                             If nargs is UNEVALLED, args points
-                             to slot holding list of unevalled args.  */
-  char evalargs : 1;
+  ptrdiff_t nargs;      /* Length of vector.  */
   /* Nonzero means call value of debugger when done with this operation.  */
-  char debug_on_exit : 1;
+  unsigned int debug_on_exit : 1;
 };
 
 static struct backtrace *backtrace_list;
@@ -1651,8 +1640,7 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
 }
 
 
-static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object,
-                                        Lisp_Object, Lisp_Object);
+static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object);
 static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig,
                                 Lisp_Object data);
 
@@ -1728,8 +1716,7 @@ See also the function `condition-case'.  */)
 
   for (h = handlerlist; h; h = h->next)
     {
-      clause = find_handler_clause (h->handler, conditions,
-                                    error_symbol, data);
+      clause = find_handler_clause (h->handler, conditions);
       if (!NILP (clause))
         break;
     }
@@ -1900,8 +1887,10 @@ skip_debugger (Lisp_Object conditions, Lisp_Object data)
 }
 
 /* Call the debugger if calling it is currently enabled for CONDITIONS.
-   SIG and DATA describe the signal, as in find_handler_clause.  */
-
+   SIG and DATA describe the signal.  There are two ways to pass them:
+    = SIG is the error symbol, and DATA is the rest of the data.
+    = SIG is nil, and DATA is (SYMBOL . REST-OF-DATA).
+      This is for memory-full errors only.  */
 static int
 maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data)
 {
@@ -1928,19 +1917,8 @@ maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data)
   return 0;
 }
 
-/* Value of Qlambda means we have called debugger and user has continued.
-   There are two ways to pass SIG and DATA:
-    = SIG is the error symbol, and DATA is the rest of the data.
-    = SIG is nil, and DATA is (SYMBOL . REST-OF-DATA).
-       This is for memory-full errors only.
-
-   We need to increase max_specpdl_size temporarily around
-   anything we do that can push on the specpdl, so as not to get
-   a second error here in case we're handling specpdl overflow.  */
-
 static Lisp_Object
-find_handler_clause (Lisp_Object handlers, Lisp_Object conditions,
-                     Lisp_Object sig, Lisp_Object data)
+find_handler_clause (Lisp_Object handlers, Lisp_Object conditions)
 {
   register Lisp_Object h;
 
@@ -2291,7 +2269,6 @@ eval_sub (Lisp_Object form)
   backtrace.function = &original_fun; /* This also protects them from gc.  */
   backtrace.args = &original_args;
   backtrace.nargs = UNEVALLED;
-  backtrace.evalargs = 1;
   backtrace.debug_on_exit = 0;
 
   if (debug_on_next_call)
@@ -2325,10 +2302,7 @@ eval_sub (Lisp_Object form)
         xsignal2 (Qwrong_number_of_arguments, original_fun, numargs);
 
       else if (XSUBR (fun)->max_args == UNEVALLED)
-        {
-          backtrace.evalargs = 0;
-          val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
-        }
+        val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
       else if (XSUBR (fun)->max_args == MANY)
         {
           /* Pass a vector of evaluated arguments.  */
@@ -2984,7 +2958,6 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   backtrace.function = &args[0];
   backtrace.args = &args[1];
   backtrace.nargs = nargs - 1;
-  backtrace.evalargs = 0;
   backtrace.debug_on_exit = 0;
 
   if (debug_on_next_call)
@@ -3141,7 +3114,6 @@ apply_lambda (Lisp_Object fun, Lisp_Object args)
 
   backtrace_list->args = arg_vector;
   backtrace_list->nargs = i;
-  backtrace_list->evalargs = 0;
   tem = funcall_lambda (fun, numargs, arg_vector);
 
   /* Do the debug-on-exit now, while arg_vector still exists.  */
@@ -3190,7 +3162,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs,
            shouldn't bind any arguments, instead just call the byte-code
            interpreter directly; it will push arguments as necessary.
 
-           Byte-code objects with either a non-existant, or a nil value for
+           Byte-code objects with either a non-existent, or a nil value for
            the `push args' slot (the default), have dynamically-bound
            arguments, and use the argument-binding code below instead (as do
            all interpreted functions, even lexically bound ones).  */
@@ -3694,46 +3666,23 @@ To prevent this happening, set `quit-flag' to nil
 before making `inhibit-quit' nil.  */);
   Vinhibit_quit = Qnil;
 
-  Qinhibit_quit = intern_c_string ("inhibit-quit");
-  staticpro (&Qinhibit_quit);
-
-  Qautoload = intern_c_string ("autoload");
-  staticpro (&Qautoload);
-
-  Qdebug_on_error = intern_c_string ("debug-on-error");
-  staticpro (&Qdebug_on_error);
-
-  Qmacro = intern_c_string ("macro");
-  staticpro (&Qmacro);
-
-  Qdeclare = intern_c_string ("declare");
-  staticpro (&Qdeclare);
+  DEFSYM (Qinhibit_quit, "inhibit-quit");
+  DEFSYM (Qautoload, "autoload");
+  DEFSYM (Qdebug_on_error, "debug-on-error");
+  DEFSYM (Qmacro, "macro");
+  DEFSYM (Qdeclare, "declare");
 
   /* Note that the process handling also uses Qexit, but we don't want
      to staticpro it twice, so we just do it here.  */
-  Qexit = intern_c_string ("exit");
-  staticpro (&Qexit);
-
-  Qinteractive = intern_c_string ("interactive");
-  staticpro (&Qinteractive);
-
-  Qcommandp = intern_c_string ("commandp");
-  staticpro (&Qcommandp);
-
-  Qdefun = intern_c_string ("defun");
-  staticpro (&Qdefun);
-
-  Qand_rest = intern_c_string ("&rest");
-  staticpro (&Qand_rest);
-
-  Qand_optional = intern_c_string ("&optional");
-  staticpro (&Qand_optional);
-
-  Qclosure = intern_c_string ("closure");
-  staticpro (&Qclosure);
+  DEFSYM (Qexit, "exit");
 
-  Qdebug = intern_c_string ("debug");
-  staticpro (&Qdebug);
+  DEFSYM (Qinteractive, "interactive");
+  DEFSYM (Qcommandp, "commandp");
+  DEFSYM (Qdefun, "defun");
+  DEFSYM (Qand_rest, "&rest");
+  DEFSYM (Qand_optional, "&optional");
+  DEFSYM (Qclosure, "closure");
+  DEFSYM (Qdebug, "debug");
 
   DEFVAR_LISP ("debug-on-error", Vdebug_on_error,
                doc: /* *Non-nil means enter debugger if an error is signaled.
@@ -3807,9 +3756,7 @@ The value the function returns is not used.  */);
    Every element of this list can be either a cons (VAR . VAL)
    specifying a lexical binding, or a single symbol VAR indicating
    that this variable should use dynamic scoping.  */
-  Qinternal_interpreter_environment
-    = intern_c_string ("internal-interpreter-environment");
-  staticpro (&Qinternal_interpreter_environment);
+  DEFSYM (Qinternal_interpreter_environment, "internal-interpreter-environment");
   DEFVAR_LISP ("internal-interpreter-environment",
                 Vinternal_interpreter_environment,
                doc: /* If non-nil, the current lexical environment of the lisp interpreter.
@@ -3821,8 +3768,7 @@ alist of active lexical bindings.  */);
      (Just imagine if someone makes it buffer-local).  */
   Funintern (Qinternal_interpreter_environment, Qnil);
 
-  Vrun_hooks = intern_c_string ("run-hooks");
-  staticpro (&Vrun_hooks);
+  DEFSYM (Vrun_hooks, "run-hooks");
 
   staticpro (&Vautoload_queue);
   Vautoload_queue = Qnil;
diff --git a/src/fileio.c b/src/fileio.c
index 824df8172e7..c6f8dfe4683 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1755,6 +1755,10 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
      regardless of what access permissions it has.  */
   if (lstat (SSDATA (encoded_filename), &statbuf) >= 0)
     {
+      if (S_ISDIR (statbuf.st_mode))
+        xsignal2 (Qfile_error,
+                  build_string ("File is a directory"), absname);
+
       if (! interactive)
         xsignal2 (Qfile_already_exists,
                   build_string ("File already exists"), absname);
@@ -5425,92 +5429,50 @@ Fread_file_name (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filena
 void
 syms_of_fileio (void)
 {
-  Qoperations = intern_c_string ("operations");
-  Qexpand_file_name = intern_c_string ("expand-file-name");
-  Qsubstitute_in_file_name = intern_c_string ("substitute-in-file-name");
-  Qdirectory_file_name = intern_c_string ("directory-file-name");
-  Qfile_name_directory = intern_c_string ("file-name-directory");
-  Qfile_name_nondirectory = intern_c_string ("file-name-nondirectory");
-  Qunhandled_file_name_directory = intern_c_string ("unhandled-file-name-directory");
-  Qfile_name_as_directory = intern_c_string ("file-name-as-directory");
-  Qcopy_file = intern_c_string ("copy-file");
-  Qmake_directory_internal = intern_c_string ("make-directory-internal");
-  Qmake_directory = intern_c_string ("make-directory");
-  Qdelete_directory_internal = intern_c_string ("delete-directory-internal");
-  Qdelete_file = intern_c_string ("delete-file");
-  Qrename_file = intern_c_string ("rename-file");
-  Qadd_name_to_file = intern_c_string ("add-name-to-file");
-  Qmake_symbolic_link = intern_c_string ("make-symbolic-link");
-  Qfile_exists_p = intern_c_string ("file-exists-p");
-  Qfile_executable_p = intern_c_string ("file-executable-p");
-  Qfile_readable_p = intern_c_string ("file-readable-p");
-  Qfile_writable_p = intern_c_string ("file-writable-p");
-  Qfile_symlink_p = intern_c_string ("file-symlink-p");
-  Qaccess_file = intern_c_string ("access-file");
-  Qfile_directory_p = intern_c_string ("file-directory-p");
-  Qfile_regular_p = intern_c_string ("file-regular-p");
-  Qfile_accessible_directory_p = intern_c_string ("file-accessible-directory-p");
-  Qfile_modes = intern_c_string ("file-modes");
-  Qset_file_modes = intern_c_string ("set-file-modes");
-  Qset_file_times = intern_c_string ("set-file-times");
-  Qfile_selinux_context = intern_c_string("file-selinux-context");
-  Qset_file_selinux_context = intern_c_string("set-file-selinux-context");
-  Qfile_newer_than_file_p = intern_c_string ("file-newer-than-file-p");
-  Qinsert_file_contents = intern_c_string ("insert-file-contents");
-  Qwrite_region = intern_c_string ("write-region");
-  Qverify_visited_file_modtime = intern_c_string ("verify-visited-file-modtime");
-  Qset_visited_file_modtime = intern_c_string ("set-visited-file-modtime");
-  Qauto_save_coding = intern_c_string ("auto-save-coding");
-
-  staticpro (&Qoperations);
-  staticpro (&Qexpand_file_name);
-  staticpro (&Qsubstitute_in_file_name);
-  staticpro (&Qdirectory_file_name);
-  staticpro (&Qfile_name_directory);
-  staticpro (&Qfile_name_nondirectory);
-  staticpro (&Qunhandled_file_name_directory);
-  staticpro (&Qfile_name_as_directory);
-  staticpro (&Qcopy_file);
-  staticpro (&Qmake_directory_internal);
-  staticpro (&Qmake_directory);
-  staticpro (&Qdelete_directory_internal);
-  staticpro (&Qdelete_file);
-  staticpro (&Qrename_file);
-  staticpro (&Qadd_name_to_file);
-  staticpro (&Qmake_symbolic_link);
-  staticpro (&Qfile_exists_p);
-  staticpro (&Qfile_executable_p);
-  staticpro (&Qfile_readable_p);
-  staticpro (&Qfile_writable_p);
-  staticpro (&Qaccess_file);
-  staticpro (&Qfile_symlink_p);
-  staticpro (&Qfile_directory_p);
-  staticpro (&Qfile_regular_p);
-  staticpro (&Qfile_accessible_directory_p);
-  staticpro (&Qfile_modes);
-  staticpro (&Qset_file_modes);
-  staticpro (&Qset_file_times);
-  staticpro (&Qfile_selinux_context);
-  staticpro (&Qset_file_selinux_context);
-  staticpro (&Qfile_newer_than_file_p);
-  staticpro (&Qinsert_file_contents);
-  staticpro (&Qwrite_region);
-  staticpro (&Qverify_visited_file_modtime);
-  staticpro (&Qset_visited_file_modtime);
-  staticpro (&Qauto_save_coding);
-
-  Qfile_name_history = intern_c_string ("file-name-history");
+  DEFSYM (Qoperations, "operations");
+  DEFSYM (Qexpand_file_name, "expand-file-name");
+  DEFSYM (Qsubstitute_in_file_name, "substitute-in-file-name");
+  DEFSYM (Qdirectory_file_name, "directory-file-name");
+  DEFSYM (Qfile_name_directory, "file-name-directory");
+  DEFSYM (Qfile_name_nondirectory, "file-name-nondirectory");
+  DEFSYM (Qunhandled_file_name_directory, "unhandled-file-name-directory");
+  DEFSYM (Qfile_name_as_directory, "file-name-as-directory");
+  DEFSYM (Qcopy_file, "copy-file");
+  DEFSYM (Qmake_directory_internal, "make-directory-internal");
+  DEFSYM (Qmake_directory, "make-directory");
+  DEFSYM (Qdelete_directory_internal, "delete-directory-internal");
+  DEFSYM (Qdelete_file, "delete-file");
+  DEFSYM (Qrename_file, "rename-file");
+  DEFSYM (Qadd_name_to_file, "add-name-to-file");
+  DEFSYM (Qmake_symbolic_link, "make-symbolic-link");
+  DEFSYM (Qfile_exists_p, "file-exists-p");
+  DEFSYM (Qfile_executable_p, "file-executable-p");
+  DEFSYM (Qfile_readable_p, "file-readable-p");
+  DEFSYM (Qfile_writable_p, "file-writable-p");
+  DEFSYM (Qfile_symlink_p, "file-symlink-p");
+  DEFSYM (Qaccess_file, "access-file");
+  DEFSYM (Qfile_directory_p, "file-directory-p");
+  DEFSYM (Qfile_regular_p, "file-regular-p");
+  DEFSYM (Qfile_accessible_directory_p, "file-accessible-directory-p");
+  DEFSYM (Qfile_modes, "file-modes");
+  DEFSYM (Qset_file_modes, "set-file-modes");
+  DEFSYM (Qset_file_times, "set-file-times");
+  DEFSYM (Qfile_selinux_context, "file-selinux-context");
+  DEFSYM (Qset_file_selinux_context, "set-file-selinux-context");
+  DEFSYM (Qfile_newer_than_file_p, "file-newer-than-file-p");
+  DEFSYM (Qinsert_file_contents, "insert-file-contents");
+  DEFSYM (Qwrite_region, "write-region");
+  DEFSYM (Qverify_visited_file_modtime, "verify-visited-file-modtime");
+  DEFSYM (Qset_visited_file_modtime, "set-visited-file-modtime");
+  DEFSYM (Qauto_save_coding, "auto-save-coding");
+
+  DEFSYM (Qfile_name_history, "file-name-history");
   Fset (Qfile_name_history, Qnil);
-  staticpro (&Qfile_name_history);
 
-  Qfile_error = intern_c_string ("file-error");
-  staticpro (&Qfile_error);
-  Qfile_already_exists = intern_c_string ("file-already-exists");
-  staticpro (&Qfile_already_exists);
-  Qfile_date_error = intern_c_string ("file-date-error");
-  staticpro (&Qfile_date_error);
-  Qexcl = intern_c_string ("excl");
-  staticpro (&Qexcl);
+  DEFSYM (Qfile_error, "file-error");
+  DEFSYM (Qfile_already_exists, "file-already-exists");
+  DEFSYM (Qfile_date_error, "file-date-error");
+  DEFSYM (Qexcl, "excl");
 
   DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system,
                doc: /* *Coding system for encoding file names.
@@ -5528,15 +5490,10 @@ instead use `file-name-coding-system' to get a constant encoding
 of file names regardless of the current language environment.  */);
   Vdefault_file_name_coding_system = Qnil;
 
-  Qformat_decode = intern_c_string ("format-decode");
-  staticpro (&Qformat_decode);
-  Qformat_annotate_function = intern_c_string ("format-annotate-function");
-  staticpro (&Qformat_annotate_function);
-  Qafter_insert_file_set_coding = intern_c_string ("after-insert-file-set-coding");
-  staticpro (&Qafter_insert_file_set_coding);
-
-  Qcar_less_than_car = intern_c_string ("car-less-than-car");
-  staticpro (&Qcar_less_than_car);
+  DEFSYM (Qformat_decode, "format-decode");
+  DEFSYM (Qformat_annotate_function, "format-annotate-function");
+  DEFSYM (Qafter_insert_file_set_coding, "after-insert-file-set-coding");
+  DEFSYM (Qcar_less_than_car, "car-less-than-car");
 
   Fput (Qfile_error, Qerror_conditions,
         Fpurecopy (list2 (Qfile_error, Qerror)));
@@ -5615,9 +5572,7 @@ After `write-region' completes, Emacs calls the function stored in
 current when building the annotations (i.e., at least once), with that
 buffer current.  */);
   Vwrite_region_annotate_functions = Qnil;
-  staticpro (&Qwrite_region_annotate_functions);
-  Qwrite_region_annotate_functions
-    = intern_c_string ("write-region-annotate-functions");
+  DEFSYM (Qwrite_region_annotate_functions, "write-region-annotate-functions");
 
   DEFVAR_LISP ("write-region-post-annotation-function",
                Vwrite_region_post_annotation_function,
@@ -5681,12 +5636,10 @@ This includes interactive calls to `delete-file' and
 `delete-directory' and the Dired deletion commands.  */);
   delete_by_moving_to_trash = 0;
   Qdelete_by_moving_to_trash = intern_c_string ("delete-by-moving-to-trash");
-  Qmove_file_to_trash = intern_c_string ("move-file-to-trash");
-  staticpro (&Qmove_file_to_trash);
-  Qcopy_directory = intern_c_string ("copy-directory");
-  staticpro (&Qcopy_directory);
-  Qdelete_directory = intern_c_string ("delete-directory");
-  staticpro (&Qdelete_directory);
+
+  DEFSYM (Qmove_file_to_trash, "move-file-to-trash");
+  DEFSYM (Qcopy_directory, "copy-directory");
+  DEFSYM (Qdelete_directory, "delete-directory");
 
   defsubr (&Sfind_file_name_handler);
   defsubr (&Sfile_name_directory);
diff --git a/src/fns.c b/src/fns.c
index 5bf274030a3..0ca731ed331 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -79,10 +79,14 @@ Other values of LIMIT are ignored.  */)
 {
   EMACS_INT val;
   Lisp_Object lispy_val;
-  EMACS_UINT denominator;
 
   if (EQ (limit, Qt))
-    seed_random (getpid () + time (NULL));
+    {
+      EMACS_TIME t;
+      EMACS_GET_TIME (t);
+      seed_random (getpid () ^ EMACS_SECS (t) ^ EMACS_USECS (t));
+    }
+
   if (NATNUMP (limit) && XFASTINT (limit) != 0)
     {
       /* Try to take our random number from the higher bits of VAL,
@@ -92,7 +96,7 @@ Other values of LIMIT are ignored.  */)
          it's possible to get a quotient larger than n; discarding
          these values eliminates the bias that would otherwise appear
          when using a large n.  */
-      denominator = ((EMACS_UINT) 1 << VALBITS) / XFASTINT (limit);
+      EMACS_INT denominator = (INTMASK + 1) / XFASTINT (limit);
       do
         val = get_random () / denominator;
       while (val >= XFASTINT (limit));
@@ -2613,6 +2617,7 @@ is not loaded; so load the file FILENAME.
 If FILENAME is omitted, the printname of FEATURE is used as the file name,
 and `load' will try to load this name appended with the suffix `.elc' or
 `.el', in that order.  The name without appended suffix will not be used.
+See `get-load-suffixes' for the complete list of suffixes.
 If the optional third argument NOERROR is non-nil,
 then return nil if the file is not found instead of signaling an error.
 Normally the return value is FEATURE.
@@ -4854,34 +4859,20 @@ syms_of_fns (void)
   DEFSYM (Qsha512, "sha512");
 
   /* Hash table stuff.  */
-  Qhash_table_p = intern_c_string ("hash-table-p");
-  staticpro (&Qhash_table_p);
-  Qeq = intern_c_string ("eq");
-  staticpro (&Qeq);
-  Qeql = intern_c_string ("eql");
-  staticpro (&Qeql);
-  Qequal = intern_c_string ("equal");
-  staticpro (&Qequal);
-  QCtest = intern_c_string (":test");
-  staticpro (&QCtest);
-  QCsize = intern_c_string (":size");
-  staticpro (&QCsize);
-  QCrehash_size = intern_c_string (":rehash-size");
-  staticpro (&QCrehash_size);
-  QCrehash_threshold = intern_c_string (":rehash-threshold");
-  staticpro (&QCrehash_threshold);
-  QCweakness = intern_c_string (":weakness");
-  staticpro (&QCweakness);
-  Qkey = intern_c_string ("key");
-  staticpro (&Qkey);
-  Qvalue = intern_c_string ("value");
-  staticpro (&Qvalue);
-  Qhash_table_test = intern_c_string ("hash-table-test");
-  staticpro (&Qhash_table_test);
-  Qkey_or_value = intern_c_string ("key-or-value");
-  staticpro (&Qkey_or_value);
-  Qkey_and_value = intern_c_string ("key-and-value");
-  staticpro (&Qkey_and_value);
+  DEFSYM (Qhash_table_p, "hash-table-p");
+  DEFSYM (Qeq, "eq");
+  DEFSYM (Qeql, "eql");
+  DEFSYM (Qequal, "equal");
+  DEFSYM (QCtest, ":test");
+  DEFSYM (QCsize, ":size");
+  DEFSYM (QCrehash_size, ":rehash-size");
+  DEFSYM (QCrehash_threshold, ":rehash-threshold");
+  DEFSYM (QCweakness, ":weakness");
+  DEFSYM (Qkey, "key");
+  DEFSYM (Qvalue, "value");
+  DEFSYM (Qhash_table_test, "hash-table-test");
+  DEFSYM (Qkey_or_value, "key-or-value");
+  DEFSYM (Qkey_and_value, "key-and-value");
 
   defsubr (&Ssxhash);
   defsubr (&Smake_hash_table);
@@ -4900,18 +4891,12 @@ syms_of_fns (void)
   defsubr (&Smaphash);
   defsubr (&Sdefine_hash_table_test);
 
-  Qstring_lessp = intern_c_string ("string-lessp");
-  staticpro (&Qstring_lessp);
-  Qprovide = intern_c_string ("provide");
-  staticpro (&Qprovide);
-  Qrequire = intern_c_string ("require");
-  staticpro (&Qrequire);
-  Qyes_or_no_p_history = intern_c_string ("yes-or-no-p-history");
-  staticpro (&Qyes_or_no_p_history);
-  Qcursor_in_echo_area = intern_c_string ("cursor-in-echo-area");
-  staticpro (&Qcursor_in_echo_area);
-  Qwidget_type = intern_c_string ("widget-type");
-  staticpro (&Qwidget_type);
+  DEFSYM (Qstring_lessp, "string-lessp");
+  DEFSYM (Qprovide, "provide");
+  DEFSYM (Qrequire, "require");
+  DEFSYM (Qyes_or_no_p_history, "yes-or-no-p-history");
+  DEFSYM (Qcursor_in_echo_area, "cursor-in-echo-area");
+  DEFSYM (Qwidget_type, "widget-type");
 
   staticpro (&string_char_byte_cache_string);
   string_char_byte_cache_string = Qnil;
@@ -4925,18 +4910,13 @@ syms_of_fns (void)
     doc: /* A list of symbols which are the features of the executing Emacs.
 Used by `featurep' and `require', and altered by `provide'.  */);
   Vfeatures = Fcons (intern_c_string ("emacs"), Qnil);
-  Qsubfeatures = intern_c_string ("subfeatures");
-  staticpro (&Qsubfeatures);
+  DEFSYM (Qsubfeatures, "subfeatures");
 
 #ifdef HAVE_LANGINFO_CODESET
-  Qcodeset = intern_c_string ("codeset");
-  staticpro (&Qcodeset);
-  Qdays = intern_c_string ("days");
-  staticpro (&Qdays);
-  Qmonths = intern_c_string ("months");
-  staticpro (&Qmonths);
-  Qpaper = intern_c_string ("paper");
-  staticpro (&Qpaper);
+  DEFSYM (Qcodeset, "codeset");
+  DEFSYM (Qdays, "days");
+  DEFSYM (Qmonths, "months");
+  DEFSYM (Qpaper, "paper");
 #endif  /* HAVE_LANGINFO_CODESET */
 
   DEFVAR_BOOL ("use-dialog-box", use_dialog_box,
diff --git a/src/frame.c b/src/frame.c
index 27a31fac3e7..635996ca424 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4240,104 +4240,58 @@ selected frame.  This is useful when `make-pointer-invisible' is set.  */)
 void
 syms_of_frame (void)
 {
-  Qframep = intern_c_string ("framep");
-  staticpro (&Qframep);
-  Qframe_live_p = intern_c_string ("frame-live-p");
-  staticpro (&Qframe_live_p);
-  Qexplicit_name = intern_c_string ("explicit-name");
-  staticpro (&Qexplicit_name);
-  Qheight = intern_c_string ("height");
-  staticpro (&Qheight);
-  Qicon = intern_c_string ("icon");
-  staticpro (&Qicon);
-  Qminibuffer = intern_c_string ("minibuffer");
-  staticpro (&Qminibuffer);
-  Qmodeline = intern_c_string ("modeline");
-  staticpro (&Qmodeline);
-  Qonly = intern_c_string ("only");
-  staticpro (&Qonly);
-  Qwidth = intern_c_string ("width");
-  staticpro (&Qwidth);
-  Qgeometry = intern_c_string ("geometry");
-  staticpro (&Qgeometry);
-  Qicon_left = intern_c_string ("icon-left");
-  staticpro (&Qicon_left);
-  Qicon_top = intern_c_string ("icon-top");
-  staticpro (&Qicon_top);
-  Qtooltip = intern_c_string ("tooltip");
-  staticpro (&Qtooltip);
-  Qleft = intern_c_string ("left");
-  staticpro (&Qleft);
-  Qright = intern_c_string ("right");
-  staticpro (&Qright);
-  Quser_position = intern_c_string ("user-position");
-  staticpro (&Quser_position);
-  Quser_size = intern_c_string ("user-size");
-  staticpro (&Quser_size);
-  Qwindow_id = intern_c_string ("window-id");
-  staticpro (&Qwindow_id);
+  DEFSYM (Qframep, "framep");
+  DEFSYM (Qframe_live_p, "frame-live-p");
+  DEFSYM (Qexplicit_name, "explicit-name");
+  DEFSYM (Qheight, "height");
+  DEFSYM (Qicon, "icon");
+  DEFSYM (Qminibuffer, "minibuffer");
+  DEFSYM (Qmodeline, "modeline");
+  DEFSYM (Qonly, "only");
+  DEFSYM (Qwidth, "width");
+  DEFSYM (Qgeometry, "geometry");
+  DEFSYM (Qicon_left, "icon-left");
+  DEFSYM (Qicon_top, "icon-top");
+  DEFSYM (Qtooltip, "tooltip");
+  DEFSYM (Qleft, "left");
+  DEFSYM (Qright, "right");
+  DEFSYM (Quser_position, "user-position");
+  DEFSYM (Quser_size, "user-size");
+  DEFSYM (Qwindow_id, "window-id");
 #ifdef HAVE_X_WINDOWS
-  Qouter_window_id = intern_c_string ("outer-window-id");
-  staticpro (&Qouter_window_id);
+  DEFSYM (Qouter_window_id, "outer-window-id");
 #endif
-  Qparent_id = intern_c_string ("parent-id");
-  staticpro (&Qparent_id);
-  Qx = intern_c_string ("x");
-  staticpro (&Qx);
-  Qw32 = intern_c_string ("w32");
-  staticpro (&Qw32);
-  Qpc = intern_c_string ("pc");
-  staticpro (&Qpc);
-  Qmac = intern_c_string ("mac");
-  staticpro (&Qmac);
-  Qns = intern_c_string ("ns");
-  staticpro (&Qns);
-  Qvisible = intern_c_string ("visible");
-  staticpro (&Qvisible);
-  Qbuffer_predicate = intern_c_string ("buffer-predicate");
-  staticpro (&Qbuffer_predicate);
-  Qbuffer_list = intern_c_string ("buffer-list");
-  staticpro (&Qbuffer_list);
-  Qburied_buffer_list = intern_c_string ("buried-buffer-list");
-  staticpro (&Qburied_buffer_list);
-  Qdisplay_type = intern_c_string ("display-type");
-  staticpro (&Qdisplay_type);
-  Qbackground_mode = intern_c_string ("background-mode");
-  staticpro (&Qbackground_mode);
-  Qnoelisp = intern_c_string ("noelisp");
-  staticpro (&Qnoelisp);
-  Qtty_color_mode = intern_c_string ("tty-color-mode");
-  staticpro (&Qtty_color_mode);
-  Qtty = intern_c_string ("tty");
-  staticpro (&Qtty);
-  Qtty_type = intern_c_string ("tty-type");
-  staticpro (&Qtty_type);
-
-  Qface_set_after_frame_default = intern_c_string ("face-set-after-frame-default");
-  staticpro (&Qface_set_after_frame_default);
-
-  Qfullwidth = intern_c_string ("fullwidth");
-  staticpro (&Qfullwidth);
-  Qfullheight = intern_c_string ("fullheight");
-  staticpro (&Qfullheight);
-  Qfullboth = intern_c_string ("fullboth");
-  staticpro (&Qfullboth);
-  Qmaximized = intern_c_string ("maximized");
-  staticpro (&Qmaximized);
-  Qx_resource_name = intern_c_string ("x-resource-name");
-  staticpro (&Qx_resource_name);
-
-  Qx_frame_parameter = intern_c_string ("x-frame-parameter");
-  staticpro (&Qx_frame_parameter);
-
-  Qterminal = intern_c_string ("terminal");
-  staticpro (&Qterminal);
-  Qterminal_live_p = intern_c_string ("terminal-live-p");
-  staticpro (&Qterminal_live_p);
+  DEFSYM (Qparent_id, "parent-id");
+  DEFSYM (Qx, "x");
+  DEFSYM (Qw32, "w32");
+  DEFSYM (Qpc, "pc");
+  DEFSYM (Qmac, "mac");
+  DEFSYM (Qns, "ns");
+  DEFSYM (Qvisible, "visible");
+  DEFSYM (Qbuffer_predicate, "buffer-predicate");
+  DEFSYM (Qbuffer_list, "buffer-list");
+  DEFSYM (Qburied_buffer_list, "buried-buffer-list");
+  DEFSYM (Qdisplay_type, "display-type");
+  DEFSYM (Qbackground_mode, "background-mode");
+  DEFSYM (Qnoelisp, "noelisp");
+  DEFSYM (Qtty_color_mode, "tty-color-mode");
+  DEFSYM (Qtty, "tty");
+  DEFSYM (Qtty_type, "tty-type");
+
+  DEFSYM (Qface_set_after_frame_default, "face-set-after-frame-default");
+
+  DEFSYM (Qfullwidth, "fullwidth");
+  DEFSYM (Qfullheight, "fullheight");
+  DEFSYM (Qfullboth, "fullboth");
+  DEFSYM (Qmaximized, "maximized");
+  DEFSYM (Qx_resource_name, "x-resource-name");
+  DEFSYM (Qx_frame_parameter, "x-frame-parameter");
+
+  DEFSYM (Qterminal, "terminal");
+  DEFSYM (Qterminal_live_p, "terminal-live-p");
 
 #ifdef HAVE_NS
-  Qns_parse_geometry = intern_c_string ("ns-parse-geometry");
-  staticpro (&Qns_parse_geometry);
+  DEFSYM (Qns_parse_geometry, "ns-parse-geometry");
 #endif
 
   {
@@ -4451,8 +4405,7 @@ actually deleted, or some time later (or even both when an earlier function
 in `delete-frame-functions' (indirectly) calls `delete-frame'
 recursively).  */);
   Vdelete_frame_functions = Qnil;
-  Qdelete_frame_functions = intern_c_string ("delete-frame-functions");
-  staticpro (&Qdelete_frame_functions);
+  DEFSYM (Qdelete_frame_functions, "delete-frame-functions");
 
   DEFVAR_LISP ("menu-bar-mode", Vmenu_bar_mode,
                doc: /* Non-nil if Menu-Bar mode is enabled.
diff --git a/src/fringe.c b/src/fringe.c
index d886ac48852..a4dc9433aff 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1738,18 +1738,12 @@ Return nil if POS is not visible in WINDOW.  */)
 void
 syms_of_fringe (void)
 {
-  Qtruncation = intern_c_string ("truncation");
-  staticpro (&Qtruncation);
-  Qcontinuation = intern_c_string ("continuation");
-  staticpro (&Qcontinuation);
-  Qoverlay_arrow = intern_c_string ("overlay-arrow");
-  staticpro (&Qoverlay_arrow);
-  Qempty_line = intern_c_string ("empty-line");
-  staticpro (&Qempty_line);
-  Qtop_bottom = intern_c_string ("top-bottom");
-  staticpro (&Qtop_bottom);
-  Qhollow_small = intern_c_string ("hollow-small");
-  staticpro (&Qhollow_small);
+  DEFSYM (Qtruncation, "truncation");
+  DEFSYM (Qcontinuation, "continuation");
+  DEFSYM (Qoverlay_arrow, "overlay-arrow");
+  DEFSYM (Qempty_line, "empty-line");
+  DEFSYM (Qtop_bottom, "top-bottom");
+  DEFSYM (Qhollow_small, "hollow-small");
 
   defsubr (&Sdestroy_fringe_bitmap);
   defsubr (&Sdefine_fringe_bitmap);
diff --git a/src/gnutls.c b/src/gnutls.c
index 9342ce7912e..76cfa5dcc98 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -51,7 +51,6 @@ static Lisp_Object Qgnutls_bootprop_callbacks;
 static Lisp_Object Qgnutls_bootprop_loglevel;
 static Lisp_Object Qgnutls_bootprop_hostname;
 static Lisp_Object Qgnutls_bootprop_verify_flags;
-static Lisp_Object Qgnutls_bootprop_verify_error;
 static Lisp_Object Qgnutls_bootprop_verify_hostname_error;
 
 /* Callback keys for `gnutls-boot'.  Unused currently.  */
@@ -380,7 +379,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte)
     /* non-fatal error */
     return -1;
   else {
-    /* a fatal error occured */
+    /* a fatal error occurred */
     return 0;
   }
 }
@@ -639,9 +638,6 @@ certificates for `gnutls-x509pki'.
 :verify-flags is a bitset as per GnuTLS'
 gnutls_certificate_set_verify_flags.
 
-:verify-error, if non-nil, makes failure of the certificate validation
-an error.  Otherwise it will be just a series of warnings.
-
 :verify-hostname-error, if non-nil, makes a hostname mismatch an
 error.  Otherwise it will be just a warning.
 
@@ -1101,72 +1097,35 @@ syms_of_gnutls (void)
 {
   gnutls_global_initialized = 0;
 
-  Qgnutls_dll = intern_c_string ("gnutls");
-  staticpro (&Qgnutls_dll);
-
-  Qgnutls_log_level = intern_c_string ("gnutls-log-level");
-  staticpro (&Qgnutls_log_level);
-
-  Qgnutls_code = intern_c_string ("gnutls-code");
-  staticpro (&Qgnutls_code);
-
-  Qgnutls_anon = intern_c_string ("gnutls-anon");
-  staticpro (&Qgnutls_anon);
-
-  Qgnutls_x509pki = intern_c_string ("gnutls-x509pki");
-  staticpro (&Qgnutls_x509pki);
-
-  Qgnutls_bootprop_hostname = intern_c_string (":hostname");
-  staticpro (&Qgnutls_bootprop_hostname);
-
-  Qgnutls_bootprop_priority = intern_c_string (":priority");
-  staticpro (&Qgnutls_bootprop_priority);
-
-  Qgnutls_bootprop_trustfiles = intern_c_string (":trustfiles");
-  staticpro (&Qgnutls_bootprop_trustfiles);
-
-  Qgnutls_bootprop_keylist = intern_c_string (":keylist");
-  staticpro (&Qgnutls_bootprop_keylist);
-
-  Qgnutls_bootprop_crlfiles = intern_c_string (":crlfiles");
-  staticpro (&Qgnutls_bootprop_crlfiles);
-
-  Qgnutls_bootprop_callbacks = intern_c_string (":callbacks");
-  staticpro (&Qgnutls_bootprop_callbacks);
-
-  Qgnutls_bootprop_callbacks_verify = intern_c_string ("verify");
-  staticpro (&Qgnutls_bootprop_callbacks_verify);
-
-  Qgnutls_bootprop_loglevel = intern_c_string (":loglevel");
-  staticpro (&Qgnutls_bootprop_loglevel);
-
-  Qgnutls_bootprop_verify_flags = intern_c_string (":verify-flags");
-  staticpro (&Qgnutls_bootprop_verify_flags);
-
-  Qgnutls_bootprop_verify_hostname_error = intern_c_string (":verify-error");
-  staticpro (&Qgnutls_bootprop_verify_error);
-
-  Qgnutls_bootprop_verify_hostname_error = intern_c_string (":verify-hostname-error");
-  staticpro (&Qgnutls_bootprop_verify_hostname_error);
-
-  Qgnutls_e_interrupted = intern_c_string ("gnutls-e-interrupted");
-  staticpro (&Qgnutls_e_interrupted);
+  DEFSYM (Qgnutls_dll, "gnutls");
+  DEFSYM (Qgnutls_log_level, "gnutls-log-level");
+  DEFSYM (Qgnutls_code, "gnutls-code");
+  DEFSYM (Qgnutls_anon, "gnutls-anon");
+  DEFSYM (Qgnutls_x509pki, "gnutls-x509pki");
+  DEFSYM (Qgnutls_bootprop_hostname, ":hostname");
+  DEFSYM (Qgnutls_bootprop_priority, ":priority");
+  DEFSYM (Qgnutls_bootprop_trustfiles, ":trustfiles");
+  DEFSYM (Qgnutls_bootprop_keylist, ":keylist");
+  DEFSYM (Qgnutls_bootprop_crlfiles, ":crlfiles");
+  DEFSYM (Qgnutls_bootprop_callbacks, ":callbacks");
+  DEFSYM (Qgnutls_bootprop_callbacks_verify, "verify");
+  DEFSYM (Qgnutls_bootprop_loglevel, ":loglevel");
+  DEFSYM (Qgnutls_bootprop_verify_flags, ":verify-flags");
+  DEFSYM (Qgnutls_bootprop_verify_hostname_error, ":verify-hostname-error");
+
+  DEFSYM (Qgnutls_e_interrupted, "gnutls-e-interrupted");
   Fput (Qgnutls_e_interrupted, Qgnutls_code,
         make_number (GNUTLS_E_INTERRUPTED));
 
-  Qgnutls_e_again = intern_c_string ("gnutls-e-again");
-  staticpro (&Qgnutls_e_again);
+  DEFSYM (Qgnutls_e_again, "gnutls-e-again");
   Fput (Qgnutls_e_again, Qgnutls_code,
         make_number (GNUTLS_E_AGAIN));
 
-  Qgnutls_e_invalid_session = intern_c_string ("gnutls-e-invalid-session");
-  staticpro (&Qgnutls_e_invalid_session);
+  DEFSYM (Qgnutls_e_invalid_session, "gnutls-e-invalid-session");
   Fput (Qgnutls_e_invalid_session, Qgnutls_code,
         make_number (GNUTLS_E_INVALID_SESSION));
 
-  Qgnutls_e_not_ready_for_handshake =
-    intern_c_string ("gnutls-e-not-ready-for-handshake");
-  staticpro (&Qgnutls_e_not_ready_for_handshake);
+  DEFSYM (Qgnutls_e_not_ready_for_handshake, "gnutls-e-not-ready-for-handshake");
   Fput (Qgnutls_e_not_ready_for_handshake, Qgnutls_code,
         make_number (GNUTLS_E_APPLICATION_ERROR_MIN));
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6c00058e7af..343fcfa083a 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1086,7 +1086,7 @@ xg_create_frame_widgets (FRAME_PTR f)
   whbox = gtk_hbox_new (FALSE, 0);
 
 #ifdef HAVE_GTK3
-  wfixed = emacs_fixed_new ();
+  wfixed = emacs_fixed_new (f);
 #else
   wfixed = gtk_fixed_new ();
 #endif
@@ -1286,18 +1286,6 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
   size_hints.min_width  = base_width + min_cols * size_hints.width_inc;
   size_hints.min_height = base_height + min_rows * size_hints.height_inc;
 
-#ifdef HAVE_GTK3
-  /* Gtk3 ignores min width/height and overwrites them with its own idea
-     of min width/height.  Put out min values to the widget so Gtk
-     gets the same value we want it to be.  Without this, a user can't
-     shrink an Emacs frame.
-  */
-  if (FRAME_GTK_WIDGET (f))
-    emacs_fixed_set_min_size (EMACS_FIXED (FRAME_GTK_WIDGET (f)),
-                              size_hints.min_width,
-                              size_hints.min_height);
-#endif
-
   /* These currently have a one to one mapping with the X values, but I
      don't think we should rely on that.  */
   hint_flags |= GDK_HINT_WIN_GRAVITY;
@@ -1336,7 +1324,7 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
     {
       BLOCK_INPUT;
       gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                                     NULL, &size_hints, hint_flags);
+                                     NULL, &size_hints, hint_flags);
       f->output_data.x->size_hints = size_hints;
       f->output_data.x->hint_flags = hint_flags;
       UNBLOCK_INPUT;
diff --git a/src/image.c b/src/image.c
index a9785e5d00f..6e8440fb431 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1836,6 +1836,8 @@ cache_image (struct frame *f, struct image *img)
   /* If no free slot found, maybe enlarge c->images.  */
   if (i == c->used && c->used == c->size)
     {
+      if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *c->images / 2 < c->size)
+        memory_full (SIZE_MAX);
       c->size *= 2;
       c->images = (struct image **) xrealloc (c->images,
                                               c->size * sizeof *c->images);
diff --git a/src/insdel.c b/src/insdel.c
index c52785cd33d..0cae578925d 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2219,8 +2219,7 @@ syms_of_insdel (void)
 This affects `before-change-functions' and `after-change-functions',
 as well as hooks attached to text properties and overlays.  */);
   inhibit_modification_hooks = 0;
-  Qinhibit_modification_hooks = intern_c_string ("inhibit-modification-hooks");
-  staticpro (&Qinhibit_modification_hooks);
+  DEFSYM (Qinhibit_modification_hooks, "inhibit-modification-hooks");
 
   defsubr (&Scombine_after_change_execute);
 }
diff --git a/src/keyboard.c b/src/keyboard.c
index bffe2b035dc..16300e6154c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1539,7 +1539,18 @@ command_loop_1 (void)
           message_with_string ("%s is undefined", keys, 0);
           KVAR (current_kboard, defining_kbd_macro) = Qnil;
           update_mode_lines = 1;
-          KVAR (current_kboard, Vprefix_arg) = Qnil;
+          /* If this is a down-mouse event, don't reset prefix-arg;
+             pass it to the command run by the up event.  */
+          if (EVENT_HAS_PARAMETERS (last_command_event))
+            {
+              Lisp_Object breakdown
+                = parse_modifiers (EVENT_HEAD (last_command_event));
+              int modifiers = XINT (XCAR (XCDR (breakdown)));
+              if (!(modifiers & down_modifier))
+                KVAR (current_kboard, Vprefix_arg) = Qnil;
+            }
+          else
+            KVAR (current_kboard, Vprefix_arg) = Qnil;
         }
       else
         {
@@ -7470,7 +7481,7 @@ menu_bar_items (Lisp_Object old)
         if (CONSP (def))
           {
             menu_bar_one_keymap_changed_items = Qnil;
-            map_keymap (def, menu_bar_item, Qnil, NULL, 1);
+            map_keymap_canonical (def, menu_bar_item, Qnil, NULL);
           }
       }
 
@@ -7811,7 +7822,7 @@ parse_menu_item (Lisp_Object item, int inmenubar)
   /* If we got no definition, this item is just unselectable text which
      is OK in a submenu but not in the menubar.  */
   if (NILP (def))
-    return (inmenubar ? 0 : 1);
+    return (!inmenubar);
 
   /* See if this is a separate pane or a submenu.  */
   def = AREF (item_properties, ITEM_PROPERTY_DEF);
diff --git a/src/keyboard.h b/src/keyboard.h
index 20763c35f3a..91008a3ea24 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -123,7 +123,7 @@ struct kboard
     Lisp_Object *kbd_macro_end;
 
     /* Allocated size of kbd_macro_buffer.  */
-    int kbd_macro_bufsize;
+    ptrdiff_t kbd_macro_bufsize;
 
     /* Last anonymous kbd macro defined.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vlast_kbd_macro);
diff --git a/src/keymap.c b/src/keymap.c
index 6ef2a716b6d..be31f72eec6 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -16,6 +16,27 @@ 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/>.  */
 
+/* Old BUGS:
+   - [M-C-a] != [?\M-\C-a]
+   - [M-f2] != [?\e f2].
+   - (define-key map [menu-bar foo] <bla>) does not always place <bla>
+     at the head of the menu (if `foo' was already bound earlier and
+     then unbound, for example).
+   TODO:
+   - allow many more Meta -> ESC mappings (like Hyper -> C-e for Emacspeak)
+   - Think about the various defaulting that's currently hard-coded in
+     keyboard.c (uppercase->lowercase, char->charset, button-events, ...)
+     and make it more generic.  Maybe we should allow mappings of the
+     form (PREDICATE . BINDING) as generalization of the default binding,
+     tho probably a cleaner way to attack this is to allow functional
+     keymaps (i.e. keymaps that are implemented as functions that implement
+     a few different methods like `lookup', `map', ...).
+   - Make [a] equivalent to [?a].
+   BEWARE:
+   - map-keymap should work meaningfully even if entries are added/removed
+     to the keymap while iterating through it:
+       start - removed <= visited <= start + added
+ */
 
 #include <config.h>
 #include <stdio.h>
@@ -73,7 +94,6 @@ static Lisp_Object where_is_cache_keymaps;
 
 static Lisp_Object Flookup_key (Lisp_Object, Lisp_Object, Lisp_Object);
 static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
-static void fix_submap_inheritance (Lisp_Object, Lisp_Object, Lisp_Object);
 
 static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object);
 static void describe_command (Lisp_Object, Lisp_Object);
@@ -130,6 +150,17 @@ in case you use it as a menu with `x-popup-menu'.  */)
   return Fcons (Qkeymap, Qnil);
 }
 
+DEFUN ("make-composed-keymap", Fmake_composed_keymap, Smake_composed_keymap,
+       0, MANY, 0,
+       doc: /* Construct and return a new keymap composed of KEYMAPS.
+When looking up a key in the returned map, the key is looked in each
+keymap in turn until a binding is found.
+usage: (make-composed-keymap &rest KEYMAPS)  */)
+  (ptrdiff_t nargs, Lisp_Object *args)
+{
+  return Fcons (Qkeymap, Flist (nargs, args));
+}
+
 /* This function is used for installing the standard key bindings
    at initialization time.
 
@@ -174,6 +205,12 @@ when reading a key-sequence to be looked-up in this keymap.  */)
       Lisp_Object tem = XCAR (map);
       if (STRINGP (tem))
         return tem;
+      else if (KEYMAPP (tem))
+        {
+          tem = Fkeymap_prompt (tem);
+          if (!NILP (tem))
+            return tem;
+        }
       map = XCDR (map);
     }
   return Qnil;
@@ -300,23 +337,16 @@ Return PARENT.  PARENT should be nil or another keymap.  */)
 {
   Lisp_Object list, prev;
   struct gcpro gcpro1, gcpro2;
-  int i;
 
-  /* Force a keymap flush for the next call to where-is.
-     Since this can be called from within where-is, we don't set where_is_cache
-     directly but only where_is_cache_keymaps, since where_is_cache shouldn't
-     be changed during where-is, while where_is_cache_keymaps is only used at
-     the very beginning of where-is and can thus be changed here without any
-     adverse effect.
-     This is a very minor correctness (rather than safety) issue.  */
-  where_is_cache_keymaps = Qt;
+  /* Flush any reverse-map cache.  */
+  where_is_cache = Qnil; where_is_cache_keymaps = Qt;
 
   GCPRO2 (keymap, parent);
   keymap = get_keymap (keymap, 1, 1);
 
   if (!NILP (parent))
     {
-      parent = get_keymap (parent, 1, 1);
+      parent = get_keymap (parent, 1, 0);
 
       /* Check for cycles.  */
       if (keymap_memberp (keymap, parent))
@@ -332,121 +362,35 @@ Return PARENT.  PARENT should be nil or another keymap.  */)
          If we came to the end, add the parent in PREV.  */
       if (!CONSP (list) || KEYMAPP (list))
         {
-          /* If we already have the right parent, return now
-             so that we avoid the loops below.  */
-          if (EQ (XCDR (prev), parent))
-            RETURN_UNGCPRO (parent);
-
           CHECK_IMPURE (prev);
           XSETCDR (prev, parent);
-          break;
+          RETURN_UNGCPRO (parent);
         }
       prev = list;
     }
-
-  /* Scan through for submaps, and set their parents too.  */
-
-  for (list = XCDR (keymap); CONSP (list); list = XCDR (list))
-    {
-      /* Stop the scan when we come to the parent.  */
-      if (EQ (XCAR (list), Qkeymap))
-        break;
-
-      /* If this element holds a prefix map, deal with it.  */
-      if (CONSP (XCAR (list))
-          && CONSP (XCDR (XCAR (list))))
-        fix_submap_inheritance (keymap, XCAR (XCAR (list)),
-                                XCDR (XCAR (list)));
-
-      if (VECTORP (XCAR (list)))
-        for (i = 0; i < ASIZE (XCAR (list)); i++)
-          if (CONSP (XVECTOR (XCAR (list))->contents[i]))
-            fix_submap_inheritance (keymap, make_number (i),
-                                    XVECTOR (XCAR (list))->contents[i]);
-
-      if (CHAR_TABLE_P (XCAR (list)))
-        {
-          map_char_table (fix_submap_inheritance, Qnil, XCAR (list), keymap);
-        }
-    }
-
-  RETURN_UNGCPRO (parent);
-}
-
-/* EVENT is defined in MAP as a prefix, and SUBMAP is its definition.
-   if EVENT is also a prefix in MAP's parent,
-   make sure that SUBMAP inherits that definition as its own parent.  */
-
-static void
-fix_submap_inheritance (Lisp_Object map, Lisp_Object event, Lisp_Object submap)
-{
-  Lisp_Object map_parent, parent_entry;
-
-  /* SUBMAP is a cons that we found as a key binding.
-     Discard the other things found in a menu key binding.  */
-
-  submap = get_keymap (get_keyelt (submap, 0), 0, 0);
-
-  /* If it isn't a keymap now, there's no work to do.  */
-  if (!CONSP (submap))
-    return;
-
-  map_parent = keymap_parent (map, 0);
-  if (!NILP (map_parent))
-    parent_entry =
-      get_keymap (access_keymap (map_parent, event, 0, 0, 0), 0, 0);
-  else
-    parent_entry = Qnil;
-
-  /* If MAP's parent has something other than a keymap,
-     our own submap shadows it completely.  */
-  if (!CONSP (parent_entry))
-    return;
-
-  if (! EQ (parent_entry, submap))
-    {
-      Lisp_Object submap_parent;
-      submap_parent = submap;
-      while (1)
-        {
-          Lisp_Object tem;
-
-          tem = keymap_parent (submap_parent, 0);
-
-          if (KEYMAPP (tem))
-            {
-              if (keymap_memberp (tem, parent_entry))
-                /* Fset_keymap_parent could create a cycle.  */
-                return;
-              submap_parent = tem;
-            }
-          else
-            break;
-        }
-      Fset_keymap_parent (submap_parent, parent_entry);
-    }
 }
 
+
 /* Look up IDX in MAP.  IDX may be any sort of event.
    Note that this does only one level of lookup; IDX must be a single
    event, not a sequence.
 
+   MAP must be a keymap or a list of keymaps.
+
    If T_OK is non-zero, bindings for Qt are treated as default
    bindings; any key left unmentioned by other tables and bindings is
    given the binding of Qt.
 
    If T_OK is zero, bindings for Qt are not treated specially.
 
-   If NOINHERIT, don't accept a subkeymap found in an inherited keymap.  */
+   If NOINHERIT, don't accept a subkeymap found in an inherited keymap.
 
-Lisp_Object
-access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload)
-{
-  Lisp_Object val;
-
-  /* Qunbound in VAL means we have found no binding yet.  */
-  val = Qunbound;
+   Returns Qunbound if no binding was found (and returns Qnil if a nil
+   binding was found).  */
 
+static Lisp_Object
+access_keymap_1 (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload)
+{
   /* If idx is a list (some sort of mouse click, perhaps?),
      the index we want to use is the car of the list, which
      ought to be a symbol.  */
@@ -461,21 +405,21 @@ access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int au
        with more than 24 bits of integer.  */
     XSETFASTINT (idx, XINT (idx) & (CHAR_META | (CHAR_META - 1)));
 
-  /* Handle the special meta -> esc mapping. */
+  /* Handle the special meta -> esc mapping.  */
   if (INTEGERP (idx) && XFASTINT (idx) & meta_modifier)
     {
       /* See if there is a meta-map.  If there's none, there is
          no binding for IDX, unless a default binding exists in MAP.  */
       struct gcpro gcpro1;
-      Lisp_Object event_meta_map;
+      Lisp_Object event_meta_binding, event_meta_map;
       GCPRO1 (map);
       /* A strange value in which Meta is set would cause
          infinite recursion.  Protect against that.  */
       if (XINT (meta_prefix_char) & CHAR_META)
         meta_prefix_char = make_number (27);
-      event_meta_map = get_keymap (access_keymap (map, meta_prefix_char,
-                                                  t_ok, noinherit, autoload),
-                                   0, autoload);
+      event_meta_binding = access_keymap_1 (map, meta_prefix_char, t_ok,
+                                            noinherit, autoload);
+      event_meta_map = get_keymap (event_meta_binding, 0, autoload);
       UNGCPRO;
       if (CONSP (event_meta_map))
         {
@@ -486,8 +430,8 @@ access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int au
         /* Set IDX to t, so that we only find a default binding.  */
         idx = Qt;
       else
-        /* We know there is no binding.  */
-        return Qnil;
+        /* An explicit nil binding, or no binding at all.  */
+        return NILP (event_meta_binding) ? Qnil : Qunbound;
     }
 
   /* t_binding is where we put a default binding that applies,
@@ -495,25 +439,52 @@ access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int au
      for this key sequence.  */
   {
     Lisp_Object tail;
-    Lisp_Object t_binding = Qnil;
+    Lisp_Object t_binding = Qunbound;
+    Lisp_Object retval = Qunbound;
+    Lisp_Object retval_tail = Qnil;
     struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 
-    GCPRO4 (map, tail, idx, t_binding);
+    GCPRO4 (tail, idx, t_binding, retval);
 
-    for (tail = XCDR (map);
+    for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map;
          (CONSP (tail)
           || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));
          tail = XCDR (tail))
       {
-        Lisp_Object binding;
+        /* Qunbound in VAL means we have found no binding.  */
+        Lisp_Object val = Qunbound;
+        Lisp_Object binding = XCAR (tail);
+        Lisp_Object submap = get_keymap (binding, 0, autoload);
 
-        binding = XCAR (tail);
-        if (SYMBOLP (binding))
+        if (EQ (binding, Qkeymap))
           {
-            /* If NOINHERIT, stop finding prefix definitions
-               after we pass a second occurrence of the `keymap' symbol.  */
-            if (noinherit && EQ (binding, Qkeymap))
-              RETURN_UNGCPRO (Qnil);
+            if (noinherit || NILP (retval))
+              /* If NOINHERIT, stop here, the rest is inherited.  */
+              break;
+            else if (!EQ (retval, Qunbound))
+              {
+                Lisp_Object parent_entry;
+                eassert (KEYMAPP (retval));
+                parent_entry
+                  = get_keymap (access_keymap_1 (tail, idx,
+                                                 t_ok, 0, autoload),
+                                0, autoload);
+                if (KEYMAPP (parent_entry))
+                  {
+                    if (CONSP (retval_tail))
+                      XSETCDR (retval_tail, parent_entry);
+                    else
+                      {
+                        retval_tail = Fcons (retval, parent_entry);
+                        retval = Fcons (Qkeymap, retval_tail);
+                      }
+                  }
+                break;
+              }
+          }
+        else if (CONSP (submap))
+          {
+            val = access_keymap_1 (submap, idx, t_ok, noinherit, autoload);
           }
         else if (CONSP (binding))
           {
@@ -556,23 +527,47 @@ access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int au
                  (i.e. it shadows any parent binding but not bindings in
                  keymaps of lower precedence).  */
               val = Qnil;
+
             val = get_keyelt (val, autoload);
-            if (KEYMAPP (val))
-              fix_submap_inheritance (map, idx, val);
-            RETURN_UNGCPRO (val);
+
+            if (!KEYMAPP (val))
+              {
+                if (NILP (retval) || EQ (retval, Qunbound))
+                  retval = val;
+                if (!NILP (val))
+                  break;  /* Shadows everything that follows.  */
+              }
+            else if (NILP (retval) || EQ (retval, Qunbound))
+              retval = val;
+            else if (CONSP (retval_tail))
+              {
+                XSETCDR (retval_tail, Fcons (val, Qnil));
+                retval_tail = XCDR (retval_tail);
+              }
+            else
+              {
+                retval_tail = Fcons (val, Qnil);
+                retval = Fcons (Qkeymap, Fcons (retval, retval_tail));
+              }
           }
         QUIT;
       }
     UNGCPRO;
-    return get_keyelt (t_binding, autoload);
+    return EQ (Qunbound, retval) ? get_keyelt (t_binding, autoload) : retval;
   }
 }
 
+Lisp_Object
+access_keymap (Lisp_Object map, Lisp_Object idx,
+               int t_ok, int noinherit, int autoload)
+{
+  Lisp_Object val = access_keymap_1 (map, idx, t_ok, noinherit, autoload);
+  return EQ (val, Qunbound) ? Qnil : val;
+}
+
 static void
 map_keymap_item (map_keymap_function_t fun, Lisp_Object args, Lisp_Object key, Lisp_Object val, void *data)
 {
-  /* We should maybe try to detect bindings shadowed by previous
-     ones and things like that.  */
   if (EQ (val, Qt))
     val = Qnil;
   (*fun) (key, val, args, data);
@@ -583,8 +578,8 @@ map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val)
 {
   if (!NILP (val))
     {
-      map_keymap_function_t fun =
-        (map_keymap_function_t) XSAVE_VALUE (XCAR (args))->pointer;
+      map_keymap_function_t fun
+        = (map_keymap_function_t) XSAVE_VALUE (XCAR (args))->pointer;
       args = XCDR (args);
       /* If the key is a range, make a copy since map_char_table modifies
          it in place.  */
@@ -612,7 +607,9 @@ map_keymap_internal (Lisp_Object map,
     {
       Lisp_Object binding = XCAR (tail);
 
-      if (CONSP (binding))
+      if (KEYMAPP (binding))    /* An embedded parent.  */
+        break;
+      else if (CONSP (binding))
         map_keymap_item (fun, args, XCAR (binding), XCDR (binding), data);
       else if (VECTORP (binding))
         {
@@ -644,7 +641,7 @@ map_keymap_call (Lisp_Object key, Lisp_Object val, Lisp_Object fun, void *dummy)
   call2 (fun, key, val);
 }
 
-/* Same as map_keymap_internal, but doesn't traverses parent keymaps as well.
+/* Same as map_keymap_internal, but traverses parent keymaps as well.
    A non-zero AUTOLOAD indicates that autoloaded keymaps should be loaded.  */
 void
 map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data, int autoload)
@@ -654,8 +651,15 @@ map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *
   map = get_keymap (map, 1, autoload);
   while (CONSP (map))
     {
-      map = map_keymap_internal (map, fun, args, data);
-      map = get_keymap (map, 0, autoload);
+      if (KEYMAPP (XCAR (map)))
+        {
+          map_keymap (XCAR (map), fun, args, data, autoload);
+          map = XCDR (map);
+        }
+      else
+        map = map_keymap_internal (map, fun, args, data);
+      if (!CONSP (map))
+        map = get_keymap (map, 0, autoload);
     }
   UNGCPRO;
 }
@@ -791,16 +795,10 @@ get_keyelt (Lisp_Object object, int autoload)
         }
 
       /* If the contents are (KEYMAP . ELEMENT), go indirect.  */
+      else if (KEYMAPP (XCAR (object)))
+        error ("Wow, indirect keymap entry!!");
       else
-        {
-          struct gcpro gcpro1;
-          Lisp_Object map;
-          GCPRO1 (object);
-          map = get_keymap (Fcar_safe (object), 0, autoload);
-          UNGCPRO;
-          return (!CONSP (map) ? object /* Invalid keymap */
-                  : access_keymap (map, Fcdr (object), 0, 0, autoload));
-        }
+        return object;
     }
 }
 
@@ -811,6 +809,9 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
   where_is_cache = Qnil;
   where_is_cache_keymaps = Qt;
 
+  if (EQ (idx, Qkeymap))
+    error ("`keymap' is reserved for embedded parent maps");
+
   /* If we are preparing to dump, and DEF is a menu element
      with a menu item indicator, copy it to ensure it is not pure.  */
   if (CONSP (def) && PURE_P (def)
@@ -903,7 +904,16 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
           }
         else if (CONSP (elt))
           {
-            if (EQ (idx, XCAR (elt)))
+            if (EQ (Qkeymap, XCAR (elt)))
+              { /* A sub keymap.  This might be due to a lookup that found
+                   two matching bindings (maybe because of a sub keymap).
+                   It almost never happens (since the second binding normally
+                   only happens in the inherited part of the keymap), but
+                   if it does, we want to update the sub-keymap since the
+                   main one might be temporary (built by access_keymap).  */
+                tail = insertion_point = elt;
+              }
+            else if (EQ (idx, XCAR (elt)))
               {
                 CHECK_IMPURE (elt);
                 XSETCDR (elt, def);
@@ -1068,7 +1078,13 @@ is not copied.  */)
             ASET (elt, i, copy_keymap_item (AREF (elt, i)));
         }
       else if (CONSP (elt))
-        elt = Fcons (XCAR (elt), copy_keymap_item (XCDR (elt)));
+        {
+          if (EQ (XCAR (elt), Qkeymap))
+            /* This is a sub keymap.  */
+            elt = Fcopy_keymap (elt);
+          else
+            elt = Fcons (XCAR (elt), copy_keymap_item (XCDR (elt)));
+        }
       XSETCDR (tail, Fcons (elt, Qnil));
       tail = XCDR (tail);
       keymap = XCDR (keymap);
@@ -1234,23 +1250,15 @@ remapping in all currently active keymaps.  */)
   ASET (command_remapping_vector, 1, command);
 
   if (NILP (keymaps))
-    return Fkey_binding (command_remapping_vector, Qnil, Qt, position);
+    command = Fkey_binding (command_remapping_vector, Qnil, Qt, position);
   else
-    {
-      Lisp_Object maps, binding;
-
-      for (maps = keymaps; CONSP (maps); maps = XCDR (maps))
-        {
-          binding = Flookup_key (XCAR (maps), command_remapping_vector, Qnil);
-          if (!NILP (binding) && !INTEGERP (binding))
-            return binding;
-        }
-      return Qnil;
-    }
+    command = Flookup_key (Fcons (Qkeymap, keymaps),
+                           command_remapping_vector, Qnil);
+  return INTEGERP (command) ? Qnil : command;
 }
 
 /* Value is number if KEY is too long; nil if valid but has no definition. */
-/* GC is possible in this function if it autoloads a keymap.  */
+/* GC is possible in this function.  */
 
 DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0,
        doc: /* In keymap KEYMAP, look up key sequence KEY.  Return the definition.
@@ -1325,10 +1333,6 @@ define_as_prefix (Lisp_Object keymap, Lisp_Object c)
   Lisp_Object cmd;
 
   cmd = Fmake_sparse_keymap (Qnil);
-  /* If this key is defined as a prefix in an inherited keymap,
-     make it a prefix in this map, and make its definition
-     inherit the other prefix definition.  */
-  cmd = nconc2 (cmd, access_keymap (keymap, c, 0, 0, 0));
   store_in_keymap (keymap, c, cmd);
 
   return cmd;
@@ -1530,7 +1534,7 @@ like in the respective argument of `key-binding'. */)
 {
   int count = SPECPDL_INDEX ();
 
-  Lisp_Object keymaps;
+  Lisp_Object keymaps = Fcons (current_global_map, Qnil);
 
   /* If a mouse click position is given, our variables are based on
      the buffer clicked on, not the current buffer.  So we may have to
@@ -1560,12 +1564,11 @@ like in the respective argument of `key-binding'. */)
         }
     }
 
-  keymaps = Fcons (current_global_map, Qnil);
-
   if (!NILP (olp))
     {
       if (!NILP (KVAR (current_kboard, Voverriding_terminal_local_map)))
-        keymaps = Fcons (KVAR (current_kboard, Voverriding_terminal_local_map), keymaps);
+        keymaps = Fcons (KVAR (current_kboard, Voverriding_terminal_local_map),
+                         keymaps);
       /* The doc said that overriding-terminal-local-map should
          override overriding-local-map.  The code used them both,
          but it seems clearer to use just one.  rms, jan 2005.  */
@@ -1576,23 +1579,19 @@ like in the respective argument of `key-binding'. */)
     {
       Lisp_Object *maps;
       int nmaps, i;
-
-      Lisp_Object keymap, local_map;
-      EMACS_INT pt;
-
-      pt = INTEGERP (position) ? XINT (position)
+      EMACS_INT pt
+        = INTEGERP (position) ? XINT (position)
         : MARKERP (position) ? marker_position (position)
         : PT;
-
-      /* Get the buffer local maps, possibly overriden by text or
-         overlay properties */
-
-      local_map = get_local_map (pt, current_buffer, Qlocal_map);
-      keymap = get_local_map (pt, current_buffer, Qkeymap);
+      /* This usually returns the buffer's local map,
+         but that can be overridden by a `local-map' property.  */
+      Lisp_Object local_map = get_local_map (pt, current_buffer, Qlocal_map);
+      /* This returns nil unless there is a `keymap' property.  */
+      Lisp_Object keymap = get_local_map (pt, current_buffer, Qkeymap);
 
       if (CONSP (position))
         {
-          Lisp_Object string;
+          Lisp_Object string = POSN_STRING (position);
 
           /* For a mouse click, get the local text-property keymap
              of the place clicked on, rather than point.  */
@@ -1619,8 +1618,7 @@ like in the respective argument of `key-binding'. */)
              consider `local-map' and `keymap' properties of
              that string.  */
 
-          if (string = POSN_STRING (position),
-              (CONSP (string) && STRINGP (XCAR (string))))
+          if (CONSP (string) && STRINGP (XCAR (string)))
             {
               Lisp_Object pos, map;
 
@@ -1691,12 +1689,7 @@ specified buffer position instead of point are used.
   */)
   (Lisp_Object key, Lisp_Object accept_default, Lisp_Object no_remap, Lisp_Object position)
 {
-  Lisp_Object *maps, value;
-  int nmaps, i;
-  struct gcpro gcpro1, gcpro2;
-  int count = SPECPDL_INDEX ();
-
-  GCPRO2 (key, position);
+  Lisp_Object value;
 
   if (NILP (position) && VECTORP (key))
     {
@@ -1715,145 +1708,9 @@ specified buffer position instead of point are used.
         }
     }
 
-  /* Key sequences beginning with mouse clicks
-     are read using the keymaps of the buffer clicked on, not
-     the current buffer.  So we may have to switch the buffer
-     here. */
-
-  if (CONSP (position))
-    {
-      Lisp_Object window;
-
-      window = POSN_WINDOW (position);
-
-      if (WINDOWP (window)
-          && BUFFERP (XWINDOW (window)->buffer)
-          && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
-        {
-          /* Arrange to go back to the original buffer once we're done
-             processing the key sequence.  We don't use
-             save_excursion_{save,restore} here, in analogy to
-             `read-key-sequence' to avoid saving point.  Maybe this
-             would not be a problem here, but it is easier to keep
-             things the same.
-          */
-
-          record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-
-          set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
-        }
-    }
-
-  if (! NILP (KVAR (current_kboard, Voverriding_terminal_local_map)))
-    {
-      value = Flookup_key (KVAR (current_kboard, Voverriding_terminal_local_map),
-                           key, accept_default);
-      if (! NILP (value) && !INTEGERP (value))
-        goto done;
-    }
-  else if (! NILP (Voverriding_local_map))
-    {
-      value = Flookup_key (Voverriding_local_map, key, accept_default);
-      if (! NILP (value) && !INTEGERP (value))
-        goto done;
-    }
-  else
-    {
-      Lisp_Object keymap, local_map;
-      EMACS_INT pt;
-
-      pt = INTEGERP (position) ? XINT (position)
-        : MARKERP (position) ? marker_position (position)
-        : PT;
-
-      local_map = get_local_map (pt, current_buffer, Qlocal_map);
-      keymap = get_local_map (pt, current_buffer, Qkeymap);
-
-      if (CONSP (position))
-        {
-          Lisp_Object string;
-
-          /* For a mouse click, get the local text-property keymap
-             of the place clicked on, rather than point.  */
+  value = Flookup_key (Fcons (Qkeymap, Fcurrent_active_maps (Qt, position)),
+                       key, accept_default);
 
-          if (POSN_INBUFFER_P (position))
-            {
-              Lisp_Object pos;
-
-              pos = POSN_BUFFER_POSN (position);
-              if (INTEGERP (pos)
-                  && XINT (pos) >= BEG && XINT (pos) <= Z)
-                {
-                  local_map = get_local_map (XINT (pos),
-                                             current_buffer, Qlocal_map);
-
-                  keymap = get_local_map (XINT (pos),
-                                          current_buffer, Qkeymap);
-                }
-            }
-
-          /* If on a mode line string with a local keymap,
-             or for a click on a string, i.e. overlay string or a
-             string displayed via the `display' property,
-             consider `local-map' and `keymap' properties of
-             that string.  */
-
-          if (string = POSN_STRING (position),
-              (CONSP (string) && STRINGP (XCAR (string))))
-            {
-              Lisp_Object pos, map;
-
-              pos = XCDR (string);
-              string = XCAR (string);
-              if (INTEGERP (pos)
-                  && XINT (pos) >= 0
-                  && XINT (pos) < SCHARS (string))
-                {
-                  map = Fget_text_property (pos, Qlocal_map, string);
-                  if (!NILP (map))
-                    local_map = map;
-
-                  map = Fget_text_property (pos, Qkeymap, string);
-                  if (!NILP (map))
-                    keymap = map;
-                }
-            }
-
-        }
-
-      if (! NILP (keymap))
-        {
-          value = Flookup_key (keymap, key, accept_default);
-          if (! NILP (value) && !INTEGERP (value))
-            goto done;
-        }
-
-      nmaps = current_minor_maps (0, &maps);
-      /* Note that all these maps are GCPRO'd
-         in the places where we found them.  */
-
-      for (i = 0; i < nmaps; i++)
-        if (! NILP (maps[i]))
-          {
-            value = Flookup_key (maps[i], key, accept_default);
-            if (! NILP (value) && !INTEGERP (value))
-              goto done;
-          }
-
-      if (! NILP (local_map))
-        {
-          value = Flookup_key (local_map, key, accept_default);
-          if (! NILP (value) && !INTEGERP (value))
-            goto done;
-        }
-    }
-
-  value = Flookup_key (current_global_map, key, accept_default);
-
- done:
-  unbind_to (count, Qnil);
-
-  UNGCPRO;
   if (NILP (value) || INTEGERP (value))
     return Qnil;
 
@@ -3774,15 +3631,13 @@ Return list of symbols found.  */)
 void
 syms_of_keymap (void)
 {
-  Qkeymap = intern_c_string ("keymap");
-  staticpro (&Qkeymap);
+  DEFSYM (Qkeymap, "keymap");
   staticpro (&apropos_predicate);
   staticpro (&apropos_accumulate);
   apropos_predicate = Qnil;
   apropos_accumulate = Qnil;
 
-  Qkeymap_canonicalize = intern_c_string ("keymap-canonicalize");
-  staticpro (&Qkeymap_canonicalize);
+  DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize");
 
   /* Now we are ready to set up this property, so we can
      create char tables.  */
@@ -3831,31 +3686,6 @@ don't alter it yourself.  */);
   Vminibuffer_local_ns_map = Fmake_sparse_keymap (Qnil);
   Fset_keymap_parent (Vminibuffer_local_ns_map, Vminibuffer_local_map);
 
-  DEFVAR_LISP ("minibuffer-local-completion-map", Vminibuffer_local_completion_map,
-               doc: /* Local keymap for minibuffer input with completion.  */);
-  Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);
-
-  DEFVAR_LISP ("minibuffer-local-filename-completion-map",
-               Vminibuffer_local_filename_completion_map,
-               doc: /* Local keymap for minibuffer input with completion for filenames.  */);
-  Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_filename_completion_map,
-                      Vminibuffer_local_completion_map);
-
-
-  DEFVAR_LISP ("minibuffer-local-must-match-map", Vminibuffer_local_must_match_map,
-               doc: /* Local keymap for minibuffer input with completion, for exact match.  */);
-  Vminibuffer_local_must_match_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_must_match_map,
-                      Vminibuffer_local_completion_map);
-
-  DEFVAR_LISP ("minibuffer-local-filename-must-match-map",
-               Vminibuffer_local_filename_must_match_map,
-               doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
-  Vminibuffer_local_filename_must_match_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_filename_must_match_map,
-                      Vminibuffer_local_must_match_map);
 
   DEFVAR_LISP ("minor-mode-map-alist", Vminor_mode_map_alist,
                doc: /* Alist of keymaps to use for minor modes.
@@ -3902,27 +3732,13 @@ preferred.  */);
                   pure_cons (intern_c_string ("mouse-5"),
                              Qnil)))))))));
 
-
-  Qsingle_key_description = intern_c_string ("single-key-description");
-  staticpro (&Qsingle_key_description);
-
-  Qkey_description = intern_c_string ("key-description");
-  staticpro (&Qkey_description);
-
-  Qkeymapp = intern_c_string ("keymapp");
-  staticpro (&Qkeymapp);
-
-  Qnon_ascii = intern_c_string ("non-ascii");
-  staticpro (&Qnon_ascii);
-
-  Qmenu_item = intern_c_string ("menu-item");
-  staticpro (&Qmenu_item);
-
-  Qremap = intern_c_string ("remap");
-  staticpro (&Qremap);
-
-  QCadvertised_binding = intern_c_string (":advertised-binding");
-  staticpro (&QCadvertised_binding);
+  DEFSYM (Qsingle_key_description, "single-key-description");
+  DEFSYM (Qkey_description, "key-description");
+  DEFSYM (Qkeymapp, "keymapp");
+  DEFSYM (Qnon_ascii, "non-ascii");
+  DEFSYM (Qmenu_item, "menu-item");
+  DEFSYM (Qremap, "remap");
+  DEFSYM (QCadvertised_binding, ":advertised-binding");
 
   command_remapping_vector = Fmake_vector (make_number (2), Qremap);
   staticpro (&command_remapping_vector);
@@ -3938,6 +3754,7 @@ preferred.  */);
   defsubr (&Sset_keymap_parent);
   defsubr (&Smake_keymap);
   defsubr (&Smake_sparse_keymap);
+  defsubr (&Smake_composed_keymap);
   defsubr (&Smap_keymap_internal);
   defsubr (&Smap_keymap);
   defsubr (&Scopy_keymap);
diff --git a/src/lisp.h b/src/lisp.h
index 4c9543bdfe8..762d34abb9c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1162,6 +1162,9 @@ struct Lisp_Symbol
 
 #define SYMBOL_CONSTANT_P(sym)   XSYMBOL (sym)->constant
 
+#define DEFSYM(sym, name)       \
+  do { (sym) = intern_c_string ((name)); staticpro (&(sym)); } while (0)
+
 
 /***********************************************************************
                              Hash Tables
@@ -1980,10 +1983,7 @@ extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int);
 #define DEFVAR_KBOARD(lname, vname, doc)                        \
   do {                                                          \
     static struct Lisp_Kboard_Objfwd ko_fwd;                    \
-    defvar_kboard (&ko_fwd,                                     \
-                   lname,                                       \
-                   (int)((char *)(&current_kboard->vname ## _)  \
-                         - (char *)current_kboard));            \
+    defvar_kboard (&ko_fwd, lname, offsetof (KBOARD, vname ## _)); \
   } while (0)
 
 
diff --git a/src/lread.c b/src/lread.c
index e75d61ae985..a9b69a1977b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -120,9 +120,9 @@ static EMACS_INT readchar_count;
 /* This contains the last string skipped with #@.  */
 static char *saved_doc_string;
 /* Length of buffer allocated in saved_doc_string.  */
-static int saved_doc_string_size;
+static ptrdiff_t saved_doc_string_size;
 /* Length of actual data in saved_doc_string.  */
-static int saved_doc_string_length;
+static ptrdiff_t saved_doc_string_length;
 /* This is the file position that string came from.  */
 static file_offset saved_doc_string_position;
 
@@ -131,9 +131,9 @@ static file_offset saved_doc_string_position;
    is put in saved_doc_string.  */
 static char *prev_saved_doc_string;
 /* Length of buffer allocated in prev_saved_doc_string.  */
-static int prev_saved_doc_string_size;
+static ptrdiff_t prev_saved_doc_string_size;
 /* Length of actual data in prev_saved_doc_string.  */
-static int prev_saved_doc_string_length;
+static ptrdiff_t prev_saved_doc_string_length;
 /* This is the file position that string came from.  */
 static file_offset prev_saved_doc_string_position;
 
@@ -1069,9 +1069,9 @@ Return t if the file exists and loads successfully.  */)
 
   /* Avoid weird lossage with null string as arg,
      since it would try to load a directory as a Lisp file */
-  if (SCHARS (file) > 0)
+  if (SBYTES (file) > 0)
     {
-      int size = SBYTES (file);
+      ptrdiff_t size = SBYTES (file);
 
       found = Qnil;
       GCPRO2 (file, found);
@@ -1472,7 +1472,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
       for (tail = NILP (suffixes) ? Fcons (empty_unibyte_string, Qnil) : suffixes;
            CONSP (tail); tail = XCDR (tail))
         {
-          int lsuffix = SBYTES (XCAR (tail));
+          ptrdiff_t lsuffix = SBYTES (XCAR (tail));
           Lisp_Object handler;
           int exists;
 
@@ -2037,7 +2037,7 @@ read0 (Lisp_Object readcharfun)
             Fmake_string (make_number (1), make_number (c)));
 }
 
-static int read_buffer_size;
+static ptrdiff_t read_buffer_size;
 static char *read_buffer;
 
 /* Read a \-escape sequence, assuming we already read the `\'.
@@ -2208,7 +2208,9 @@ read_escape (Lisp_Object readcharfun, int stringp)
                 UNREAD (c);
                 break;
               }
-            count++;
+            if (MAX_CHAR < i)
+              error ("Hex character out of range: \\x%x...", i);
+            count += count < 3;
           }
 
         if (count < 3 && i >= 0x80)
@@ -2236,10 +2238,7 @@ read_escape (Lisp_Object readcharfun, int stringp)
             else if (c >= 'a' && c <= 'f')  i = (i << 4) + (c - 'a') + 10;
             else if (c >= 'A' && c <= 'F')  i = (i << 4) + (c - 'A') + 10;
             else
-              {
-                error ("Non-hex digit used for Unicode escape");
-                break;
-              }
+              error ("Non-hex digit used for Unicode escape");
           }
         if (i > 0x10FFFF)
           error ("Non-Unicode character: 0x%x", i);
@@ -2278,10 +2277,12 @@ digit_to_number (int character, int base)
    range.  */
 
 static Lisp_Object
-read_integer (Lisp_Object readcharfun, int radix)
+read_integer (Lisp_Object readcharfun, EMACS_INT radix)
 {
-  /* Room for sign, leading 0, other digits, trailing null byte.  */
-  char buf[1 + 1 + sizeof (uintmax_t) * CHAR_BIT + 1];
+  /* Room for sign, leading 0, other digits, trailing null byte.
+     Also, room for invalid syntax diagnostic.  */
+  char buf[max (1 + 1 + sizeof (uintmax_t) * CHAR_BIT + 1,
+                sizeof "integer, radix " + INT_STRLEN_BOUND (EMACS_INT))];
 
   int valid = -1; /* 1 if valid, 0 if not, -1 if incomplete.  */
 
@@ -2333,7 +2334,7 @@ read_integer (Lisp_Object readcharfun, int radix)
 
   if (! valid)
     {
-      sprintf (buf, "integer, radix %d", radix);
+      sprintf (buf, "integer, radix %"pI"d", radix);
       invalid_syntax (buf);
     }
 
@@ -2471,7 +2472,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               if (c == '[')
                 {
                   Lisp_Object tmp;
-                  int depth, size;
+                  EMACS_INT depth, size;
 
                   tmp = read_vector (readcharfun, 0);
                   if (!INTEGERP (AREF (tmp, 0)))
@@ -2497,7 +2498,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           if (c == '"')
             {
               Lisp_Object tmp, val;
-              int size_in_chars
+              EMACS_INT size_in_chars
                 = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
                    / BOOL_VECTOR_BITS_PER_CHAR);
 
@@ -2569,13 +2570,16 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
          and function definitions.  */
       if (c == '@')
         {
-          int i, nskip = 0;
+          enum { extra = 100 };
+          ptrdiff_t i, nskip = 0;
 
           load_each_byte = 1;
           /* Read a decimal integer.  */
           while ((c = READCHAR) >= 0
                  && c >= '0' && c <= '9')
             {
+              if ((STRING_BYTES_BOUND - extra) / 10 <= nskip)
+                string_overflow ();
               nskip *= 10;
               nskip += c - '0';
             }
@@ -2594,9 +2598,9 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
                  with prev_saved_doc_string, so we save two strings.  */
               {
                 char *temp = saved_doc_string;
-                int temp_size = saved_doc_string_size;
+                ptrdiff_t temp_size = saved_doc_string_size;
                 file_offset temp_pos = saved_doc_string_position;
-                int temp_len = saved_doc_string_length;
+                ptrdiff_t temp_len = saved_doc_string_length;
 
                 saved_doc_string = prev_saved_doc_string;
                 saved_doc_string_size = prev_saved_doc_string_size;
@@ -2611,12 +2615,12 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 
               if (saved_doc_string_size == 0)
                 {
-                  saved_doc_string_size = nskip + 100;
+                  saved_doc_string_size = nskip + extra;
                   saved_doc_string = (char *) xmalloc (saved_doc_string_size);
                 }
               if (nskip > saved_doc_string_size)
                 {
-                  saved_doc_string_size = nskip + 100;
+                  saved_doc_string_size = nskip + extra;
                   saved_doc_string = (char *) xrealloc (saved_doc_string,
                                                         saved_doc_string_size);
                 }
@@ -2661,49 +2665,60 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
       /* Reader forms that can reuse previously read objects.  */
       if (c >= '0' && c <= '9')
         {
-          int n = 0;
+          EMACS_INT n = 0;
           Lisp_Object tem;
 
           /* Read a non-negative integer.  */
           while (c >= '0' && c <= '9')
             {
-              n *= 10;
-              n += c - '0';
+              if (MOST_POSITIVE_FIXNUM / 10 < n
+                  || MOST_POSITIVE_FIXNUM < n * 10 + c - '0')
+                n = MOST_POSITIVE_FIXNUM + 1;
+              else
+                n = n * 10 + c - '0';
               c = READCHAR;
             }
-          /* #n=object returns object, but associates it with n for #n#.  */
-          if (c == '=' && !NILP (Vread_circle))
+
+          if (n <= MOST_POSITIVE_FIXNUM)
             {
-              /* Make a placeholder for #n# to use temporarily */
-              Lisp_Object placeholder;
-              Lisp_Object cell;
+              if (c == 'r' || c == 'R')
+                return read_integer (readcharfun, n);
 
-              placeholder = Fcons (Qnil, Qnil);
-              cell = Fcons (make_number (n), placeholder);
-              read_objects = Fcons (cell, read_objects);
+              if (! NILP (Vread_circle))
+                {
+                  /* #n=object returns object, but associates it with
+                      n for #n#.  */
+                  if (c == '=')
+                    {
+                      /* Make a placeholder for #n# to use temporarily */
+                      Lisp_Object placeholder;
+                      Lisp_Object cell;
 
-              /* Read the object itself. */
-              tem = read0 (readcharfun);
+                      placeholder = Fcons (Qnil, Qnil);
+                      cell = Fcons (make_number (n), placeholder);
+                      read_objects = Fcons (cell, read_objects);
 
-              /* Now put it everywhere the placeholder was... */
-              substitute_object_in_subtree (tem, placeholder);
+                      /* Read the object itself. */
+                      tem = read0 (readcharfun);
 
-              /* ...and #n# will use the real value from now on.  */
-              Fsetcdr (cell, tem);
+                      /* Now put it everywhere the placeholder was... */
+                      substitute_object_in_subtree (tem, placeholder);
 
-              return tem;
-            }
-          /* #n# returns a previously read object.  */
-          if (c == '#' && !NILP (Vread_circle))
-            {
-              tem = Fassq (make_number (n), read_objects);
-              if (CONSP (tem))
-                return XCDR (tem);
-              /* Fall through to error message.  */
-            }
-          else if (c == 'r' ||  c == 'R')
-            return read_integer (readcharfun, n);
+                      /* ...and #n# will use the real value from now on.  */
+                      Fsetcdr (cell, tem);
+
+                      return tem;
+                    }
 
+                  /* #n# returns a previously read object.  */
+                  if (c == '#')
+                    {
+                      tem = Fassq (make_number (n), read_objects);
+                      if (CONSP (tem))
+                        return XCDR (tem);
+                    }
+                }
+            }
           /* Fall through to error message.  */
         }
       else if (c == 'x' || c == 'X')
@@ -2846,14 +2861,16 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
            a single-byte character.  */
         int force_singlebyte = 0;
         int cancel = 0;
-        int nchars = 0;
+        ptrdiff_t nchars = 0;
 
         while ((ch = READCHAR) >= 0
                && ch != '\"')
           {
             if (end - p < MAX_MULTIBYTE_LENGTH)
               {
-                int offset = p - read_buffer;
+                ptrdiff_t offset = p - read_buffer;
+                if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+                  memory_full (SIZE_MAX);
                 read_buffer = (char *) xrealloc (read_buffer,
                                                  read_buffer_size *= 2);
                 p = read_buffer + offset;
@@ -2996,7 +3013,9 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
             {
               if (end - p < MAX_MULTIBYTE_LENGTH)
                 {
-                  int offset = p - read_buffer;
+                  ptrdiff_t offset = p - read_buffer;
+                  if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+                    memory_full (SIZE_MAX);
                   read_buffer = (char *) xrealloc (read_buffer,
                                                    read_buffer_size *= 2);
                   p = read_buffer + offset;
@@ -3023,7 +3042,9 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 
           if (p == end)
             {
-              int offset = p - read_buffer;
+              ptrdiff_t offset = p - read_buffer;
+              if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
+                memory_full (SIZE_MAX);
               read_buffer = (char *) xrealloc (read_buffer,
                                                read_buffer_size *= 2);
               p = read_buffer + offset;
@@ -3135,7 +3156,7 @@ substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Obj
     {
     case Lisp_Vectorlike:
       {
-        int i, length = 0;
+        ptrdiff_t i, length = 0;
         if (BOOL_VECTOR_P (subtree))
           return subtree;               /* No sub-objects anyway.  */
         else if (CHAR_TABLE_P (subtree) || SUB_CHAR_TABLE_P (subtree)
@@ -3358,8 +3379,7 @@ string_to_number (char const *string, int base, int ignore_trailing)
 static Lisp_Object
 read_vector (Lisp_Object readcharfun, int bytecodeflag)
 {
-  register int i;
-  register int size;
+  ptrdiff_t i, size;
   register Lisp_Object *ptr;
   register Lisp_Object tem, item, vector;
   register struct Lisp_Cons *otem;
@@ -3528,15 +3548,15 @@ read_list (int flag, register Lisp_Object readcharfun)
                          doc string, caller must make it
                          multibyte.  */
 
-                      int pos = XINT (XCDR (val));
+                      EMACS_INT pos = XINT (XCDR (val));
                       /* Position is negative for user variables.  */
                       if (pos < 0) pos = -pos;
                       if (pos >= saved_doc_string_position
                           && pos < (saved_doc_string_position
                                     + saved_doc_string_length))
                         {
-                          int start = pos - saved_doc_string_position;
-                          int from, to;
+                          ptrdiff_t start = pos - saved_doc_string_position;
+                          ptrdiff_t from, to;
 
                           /* Process quoting with ^A,
                              and find the end of the string,
@@ -3567,8 +3587,9 @@ read_list (int flag, register Lisp_Object readcharfun)
                                && pos < (prev_saved_doc_string_position
                                          + prev_saved_doc_string_length))
                         {
-                          int start = pos - prev_saved_doc_string_position;
-                          int from, to;
+                          ptrdiff_t start =
+                            pos - prev_saved_doc_string_position;
+                          ptrdiff_t from, to;
 
                           /* Process quoting with ^A,
                              and find the end of the string,
@@ -3891,7 +3912,7 @@ hash_string (const char *ptr, size_t len)
 void
 map_obarray (Lisp_Object obarray, void (*fn) (Lisp_Object, Lisp_Object), Lisp_Object arg)
 {
-  register int i;
+  ptrdiff_t i;
   register Lisp_Object tail;
   CHECK_VECTOR (obarray);
   for (i = ASIZE (obarray) - 1; i >= 0; i--)
@@ -3962,8 +3983,7 @@ init_obarray (void)
   /* Qt is correct even if CANNOT_DUMP.  loadup.el will set to nil at end.  */
   Vpurify_flag = Qt;
 
-  Qvariable_documentation = intern_c_string ("variable-documentation");
-  staticpro (&Qvariable_documentation);
+  DEFSYM (Qvariable_documentation, "variable-documentation");
 
   read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH;
   read_buffer = (char *) xmalloc (read_buffer_size);
@@ -3991,7 +4011,7 @@ defalias (sname, string)
 #endif /* NOTDEF */
 
 /* Define an "integer variable"; a symbol whose value is forwarded to a
-   C variable of type int.  Sample call (munged w "xx" to fool make-docfile):
+   C variable of type EMACS_INT.  Sample call (with "xx" to fool make-docfile):
    DEFxxVAR_INT ("emacs-priority", &emacs_priority, "Documentation");  */
 void
 defvar_int (struct Lisp_Intfwd *i_fwd,
@@ -4371,8 +4391,7 @@ customize `jka-compr-load-suffixes' rather than the present variable.  */);
 
   DEFVAR_BOOL ("load-in-progress", load_in_progress,
                doc: /* Non-nil if inside of `load'.  */);
-  Qload_in_progress = intern_c_string ("load-in-progress");
-  staticpro (&Qload_in_progress);
+  DEFSYM (Qload_in_progress, "load-in-progress");
 
   DEFVAR_LISP ("after-load-alist", Vafter_load_alist,
                doc: /* An alist of expressions to be evalled when particular files are loaded.
@@ -4401,9 +4420,11 @@ The remaining ENTRIES in the alist element describe the functions and
 variables defined in that file, the features provided, and the
 features required.  Each entry has the form `(provide . FEATURE)',
 `(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)',
-`(defface . SYMBOL)', or `(t . SYMBOL)'.  In addition, an entry `(t
-. SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that
-SYMBOL was an autoload before this file redefined it as a function.
+`(defface . SYMBOL)', or `(t . SYMBOL)'.  Entries like `(t . SYMBOL)'
+may precede a `(defun . FUNCTION)' entry, and means that SYMBOL was an
+autoload before this file redefined it as a function.  In addition,
+entries may also be single symbols, which means that SYMBOL was
+defined by `defvar' or `defconst'.
 
 During preloading, the file name recorded is relative to the main Lisp
 directory.  These file names are converted to absolute at startup.  */);
@@ -4503,67 +4524,34 @@ This variable is automatically set from the file variables of an interpreted
   DEFVAR_LISP ("old-style-backquotes", Vold_style_backquotes,
                doc: /* Set to non-nil when `read' encounters an old-style backquote.  */);
   Vold_style_backquotes = Qnil;
-  Qold_style_backquotes = intern_c_string ("old-style-backquotes");
-  staticpro (&Qold_style_backquotes);
+  DEFSYM (Qold_style_backquotes, "old-style-backquotes");
 
   /* Vsource_directory was initialized in init_lread.  */
 
   load_descriptor_list = Qnil;
   staticpro (&load_descriptor_list);
 
-  Qcurrent_load_list = intern_c_string ("current-load-list");
-  staticpro (&Qcurrent_load_list);
-
-  Qstandard_input = intern_c_string ("standard-input");
-  staticpro (&Qstandard_input);
-
-  Qread_char = intern_c_string ("read-char");
-  staticpro (&Qread_char);
-
-  Qget_file_char = intern_c_string ("get-file-char");
-  staticpro (&Qget_file_char);
-
-  Qget_emacs_mule_file_char = intern_c_string ("get-emacs-mule-file-char");
-  staticpro (&Qget_emacs_mule_file_char);
-
-  Qload_force_doc_strings = intern_c_string ("load-force-doc-strings");
-  staticpro (&Qload_force_doc_strings);
-
-  Qbackquote = intern_c_string ("`");
-  staticpro (&Qbackquote);
-  Qcomma = intern_c_string (",");
-  staticpro (&Qcomma);
-  Qcomma_at = intern_c_string (",@");
-  staticpro (&Qcomma_at);
-  Qcomma_dot = intern_c_string (",.");
-  staticpro (&Qcomma_dot);
-
-  Qinhibit_file_name_operation = intern_c_string ("inhibit-file-name-operation");
-  staticpro (&Qinhibit_file_name_operation);
-
-  Qascii_character = intern_c_string ("ascii-character");
-  staticpro (&Qascii_character);
-
-  Qfunction = intern_c_string ("function");
-  staticpro (&Qfunction);
-
-  Qload = intern_c_string ("load");
-  staticpro (&Qload);
-
-  Qload_file_name = intern_c_string ("load-file-name");
-  staticpro (&Qload_file_name);
-
-  Qeval_buffer_list = intern_c_string ("eval-buffer-list");
-  staticpro (&Qeval_buffer_list);
-
-  Qfile_truename = intern_c_string ("file-truename");
-  staticpro (&Qfile_truename) ;
-
-  Qdir_ok = intern_c_string ("dir-ok");
-  staticpro (&Qdir_ok);
-
-  Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation");
-  staticpro (&Qdo_after_load_evaluation) ;
+  DEFSYM (Qcurrent_load_list, "current-load-list");
+  DEFSYM (Qstandard_input, "standard-input");
+  DEFSYM (Qread_char, "read-char");
+  DEFSYM (Qget_file_char, "get-file-char");
+  DEFSYM (Qget_emacs_mule_file_char, "get-emacs-mule-file-char");
+  DEFSYM (Qload_force_doc_strings, "load-force-doc-strings");
+
+  DEFSYM (Qbackquote, "`");
+  DEFSYM (Qcomma, ",");
+  DEFSYM (Qcomma_at, ",@");
+  DEFSYM (Qcomma_dot, ",.");
+
+  DEFSYM (Qinhibit_file_name_operation, "inhibit-file-name-operation");
+  DEFSYM (Qascii_character, "ascii-character");
+  DEFSYM (Qfunction, "function");
+  DEFSYM (Qload, "load");
+  DEFSYM (Qload_file_name, "load-file-name");
+  DEFSYM (Qeval_buffer_list, "eval-buffer-list");
+  DEFSYM (Qfile_truename, "file-truename");
+  DEFSYM (Qdir_ok, "dir-ok");
+  DEFSYM (Qdo_after_load_evaluation, "do-after-load-evaluation");
 
   staticpro (&dump_path);
 
@@ -4575,18 +4563,11 @@ This variable is automatically set from the file variables of an interpreted
   Vloads_in_progress = Qnil;
   staticpro (&Vloads_in_progress);
 
-  Qhash_table = intern_c_string ("hash-table");
-  staticpro (&Qhash_table);
-  Qdata = intern_c_string ("data");
-  staticpro (&Qdata);
-  Qtest = intern_c_string ("test");
-  staticpro (&Qtest);
-  Qsize = intern_c_string ("size");
-  staticpro (&Qsize);
-  Qweakness = intern_c_string ("weakness");
-  staticpro (&Qweakness);
-  Qrehash_size = intern_c_string ("rehash-size");
-  staticpro (&Qrehash_size);
-  Qrehash_threshold = intern_c_string ("rehash-threshold");
-  staticpro (&Qrehash_threshold);
+  DEFSYM (Qhash_table, "hash-table");
+  DEFSYM (Qdata, "data");
+  DEFSYM (Qtest, "test");
+  DEFSYM (Qsize, "size");
+  DEFSYM (Qweakness, "weakness");
+  DEFSYM (Qrehash_size, "rehash-size");
+  DEFSYM (Qrehash_threshold, "rehash-threshold");
 }
diff --git a/src/macros.c b/src/macros.c
index 3523e513d6a..60f30c3fbbe 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -71,10 +71,10 @@ macro before appending to it. */)
     {
       if (current_kboard->kbd_macro_bufsize > 200)
         {
-          current_kboard->kbd_macro_bufsize = 30;
           current_kboard->kbd_macro_buffer
             = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
                                        30 * sizeof (Lisp_Object));
+          current_kboard->kbd_macro_bufsize = 30;
         }
       current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
       current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
@@ -82,7 +82,8 @@ macro before appending to it. */)
     }
   else
     {
-      int i, len;
+      ptrdiff_t i;
+      EMACS_INT len;
       int cvt;
 
       /* Check the type of last-kbd-macro in case Lisp code changed it.  */
@@ -94,10 +95,13 @@ macro before appending to it. */)
          has put another macro there.  */
       if (current_kboard->kbd_macro_bufsize < len + 30)
         {
-          current_kboard->kbd_macro_bufsize = len + 30;
+          if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (Lisp_Object) - 30
+              < current_kboard->kbd_macro_bufsize)
+            memory_full (SIZE_MAX);
           current_kboard->kbd_macro_buffer
             = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
                                        (len + 30) * sizeof (Lisp_Object));
+          current_kboard->kbd_macro_bufsize = len + 30;
         }
 
       /* Must convert meta modifier when copying string to vector.  */
@@ -191,14 +195,17 @@ store_kbd_macro_char (Lisp_Object c)
     {
       if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize)
         {
-          int ptr_offset, end_offset, nbytes;
+          ptrdiff_t ptr_offset, end_offset, nbytes;
 
           ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
           end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
-          kb->kbd_macro_bufsize *= 2;
-          nbytes = kb->kbd_macro_bufsize * sizeof *kb->kbd_macro_buffer;
+          if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *kb->kbd_macro_buffer / 2
+              < kb->kbd_macro_bufsize)
+            memory_full (SIZE_MAX);
+          nbytes = kb->kbd_macro_bufsize * 2 * sizeof *kb->kbd_macro_buffer;
           kb->kbd_macro_buffer
             = (Lisp_Object *) xrealloc (kb->kbd_macro_buffer, nbytes);
+          kb->kbd_macro_bufsize *= 2;
           kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset;
           kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset;
         }
@@ -360,15 +367,13 @@ init_macros (void)
 void
 syms_of_macros (void)
 {
-  Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro");
-  staticpro (&Qexecute_kbd_macro);
+  DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro");
 
   DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook,
                doc: /* Normal hook run whenever a keyboard macro terminates.
 This is run whether the macro ends normally or prematurely due to an error.  */);
   Vkbd_macro_termination_hook = Qnil;
-  Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook");
-  staticpro (&Qkbd_macro_termination_hook);
+  DEFSYM (Qkbd_macro_termination_hook, "kbd-macro-termination-hook");
 
   defsubr (&Sstart_kbd_macro);
   defsubr (&Send_kbd_macro);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 173fc673955..88b53554925 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -382,471 +382,452 @@ full-tags: TAGS TAGS-LISP ../nt/TAGS
 ### DEPENDENCIES ###
 
 EMACS_ROOT = ..
-CONFIG_H   = $(EMACS_ROOT)/src/s/ms-w32.h \
-             $(EMACS_ROOT)/src/m/intel386.h \
-             $(EMACS_ROOT)/src/config.h \
-             $(EMACS_ROOT)/nt/inc/sys/stat.h
-LISP_H     = $(SRC)/lisp.h \
-             $(SRC)/globals.h \
-             $(EMACS_ROOT)/lib/intprops.h \
-             $(EMACS_ROOT)/nt/inc/inttypes.h \
-             $(EMACS_ROOT)/nt/inc/stdint.h
-PROCESS_H  = $(SRC)/process.h \
-             $(EMACS_ROOT)/nt/inc/unistd.h \
-             $(SRC)/gnutls.h
+GNU_LIB = $(EMACS_ROOT)/lib
+NT_INC = $(EMACS_ROOT)/nt/inc
+
+SYSTIME_H      = $(SRC)/systime.h \
+                 $(NT_INC)/sys/time.h
+ATIMER_H       = $(SRC)/atimer.h \
+                 $(SYSTIME_H)
+BLOCKINPUT_H   = $(SRC)/blockinput.h \
+                 $(ATIMER_H)
+CAREADLINKAT_H = $(GNU_LIB)/careadlinkat.h \
+                 $(NT_INC)/unistd.h
+CHARACTER_H    = $(SRC)/character.h \
+                 $(GNU_LIB)/verify.h
+CHARSET_H      = $(SRC)/charset.h \
+                 $(GNU_LIB)/verify.h
+CODING_H       = $(SRC)/coding.h \
+                 $(SRC)/composite.h
+MS_W32_H       = $(SRC)/s/ms-w32.h \
+                 $(NT_INC)/sys/stat.h
+CONFIG_H       = $(SRC)/config.h \
+                 $(SRC)/m/intel386.h \
+                 $(MS_W32_H)
+DIR_H          = $(NT_INC)/sys/dir.h \
+                 $(SRC)/ndir.h
+W32GUI_H       = $(SRC)/w32gui.h \
+                 $(SYSTIME_H)
+DISPEXTERN_H   = $(SRC)/dispextern.h \
+                 $(W32GUI_H)
+FILEMODE_H     = $(GNU_LIB)/filemode.h \
+                 $(NT_INC)/sys/stat.h
+FONT_H         = $(SRC)/font.h \
+                 $(SRC)/ccl.h
+FRAME_H        = $(SRC)/frame.h \
+                 $(DISPEXTERN_H)
+FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
+                 $(GNU_LIB)/intprops.h
+GRP_H          = $(NT_INC)/grp.h \
+                 $(NT_INC)/pwd.h
+INTERVALS_H    = $(SRC)/intervals.h \
+                 $(SRC)/composite.h \
+                 $(DISPEXTERN_H)
+INTTYPES_H     = $(NT_INC)/inttypes.h \
+                 $(NT_INC)/stdint.h
+KEYBOARD_H     = $(SRC)/keyboard.h \
+                 $(CODING_H) \
+                 $(SYSTIME_H)
+LANGINFO_H     = $(NT_INC)/langinfo.h \
+                 $(NT_INC)/nl_types.h
+LISP_H         = $(SRC)/lisp.h \
+                 $(SRC)/globals.h \
+                 $(GNU_LIB)/intprops.h \
+                 $(INTTYPES_H)
+MD5_H          = $(GNU_LIB)/md5.h \
+                 $(NT_INC)/stdint.h
+MENU_H         = $(SRC)/menu.h \
+                 $(SYSTIME_H)
+PROCESS_H      = $(SRC)/process.h \
+                 $(SRC)/gnutls.h \
+                 $(NT_INC)/unistd.h
+SHA1_H         = $(GNU_LIB)/sha1.h \
+                 $(NT_INC)/stdint.h
+SHA256_H       = $(GNU_LIB)/sha256.h \
+                 $(NT_INC)/stdint.h
+U64_H          = $(GNU_LIB)/u64.h \
+                 $(NT_INC)/stdint.h
+SHA512_H       = $(GNU_LIB)/sha512.h \
+                 $(U64_H)
+SOCKET_H       = $(NT_INC)/sys/socket.h \
+                 $(SRC)/w32.h
+SYSTTY_H       = $(SRC)/systty.h \
+                 $(NT_INC)/sys/ioctl.h \
+                 $(NT_INC)/unistd.h
+TERMHOOKS_H    = $(SRC)/termhooks.h \
+                 $(SYSTIME_H)
+W32TERM_H      = $(SRC)/w32term.h \
+                 $(W32GUI_H)
+WINDOW_H       = $(SRC)/window.h \
+                 $(DISPEXTERN_H)
 
 $(BLD)/alloc.$(O) : \
         $(SRC)/alloc.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/puresize.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
         $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/atimer.$(O) : \
         $(SRC)/atimer.c \
+        $(SRC)/syssignal.h \
+        $(NT_INC)/sys/time.h \
+        $(NT_INC)/unistd.h \
+        $(ATIMER_H) \
+        $(BLOCKINPUT_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/syssignal.h \
-        $(SRC)/systime.h
+        $(SYSTIME_H)
 
 $(BLD)/bidi.$(O) : \
         $(SRC)/bidi.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/bidimirror.h \
         $(SRC)/biditype.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(LISP_H)
 
 $(BLD)/buffer.$(O) : \
         $(SRC)/buffer.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/param.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
         $(SRC)/indent.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/region-cache.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/param.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/verify.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/bytecode.$(O) : \
         $(SRC)/bytecode.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/dispextern.h \
         $(SRC)/syntax.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/callint.$(O) : \
         $(SRC)/callint.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/callproc.$(O) : \
         $(SRC)/callproc.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/epaths.h \
-        $(SRC)/frame.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
-        $(SRC)/termhooks.h \
         $(SRC)/w32.h \
-        $(SRC)/w32gui.h
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H)
 
 $(BLD)/casefiddle.$(O) : \
         $(SRC)/casefiddle.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
         $(SRC)/keymap.h \
-        $(SRC)/syntax.h
+        $(SRC)/syntax.h \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/casetab.$(O) : \
         $(SRC)/casetab.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/category.$(O) : \
         $(SRC)/category.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/category.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/keymap.h
+        $(SRC)/keymap.h \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/ccl.$(O) : \
         $(SRC)/ccl.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/character.$(O) : \
         $(SRC)/character.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
         $(SRC)/composite.h \
-        $(SRC)/disptab.h
+        $(SRC)/disptab.h \
+        $(GNU_LIB)/intprops.h \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/charset.$(O) : \
         $(SRC)/charset.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/disptab.h
+        $(SRC)/disptab.h \
+        $(NT_INC)/unistd.h \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/chartab.$(O) : \
         $(SRC)/chartab.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/cmds.$(O) : \
         $(SRC)/cmds.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/syntax.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/coding.$(O) : \
         $(SRC)/coding.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/composite.$(O) : \
         $(SRC)/composite.c \
+        $(SRC)/buffer.h \
+        $(CHARACTER_H) \
+        $(CODING_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
         $(LISP_H) \
-        $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/data.$(O) : \
         $(SRC)/data.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
         $(SRC)/puresize.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h
+        $(GNU_LIB)/intprops.h \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H)
 
 $(BLD)/dired.$(O) : \
         $(SRC)/dired.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/grp.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/dir.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/filemode.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/ndir.h \
         $(SRC)/regex.h \
-        $(SRC)/systime.h
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DIR_H) \
+        $(FILEMODE_H) \
+        $(GRP_H) \
+        $(LISP_H) \
+        $(SYSTIME_H)
 
 $(BLD)/dispnew.$(O) : \
         $(SRC)/dispnew.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
         $(SRC)/cm.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
         $(SRC)/indent.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTIME_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/doc.$(O) : \
         $(SRC)/doc.c \
-        $(CONFIG_H) \
-        buildobj.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/keyboard.h \
+        $(SRC)/buildobj.h \
         $(SRC)/keymap.h \
-        $(SRC)/systime.h
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/unistd.h \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H)
 
 $(BLD)/doprnt.$(O) : \
         $(SRC)/doprnt.c \
+        $(NT_INC)/unistd.h \
+        $(CHARACTER_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(LISP_H) \
-        $(SRC)/character.h
+        $(LISP_H)
 
 $(BLD)/editfns.$(O) : \
         $(SRC)/editfns.c \
+        $(SRC)/buffer.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/intprops.h \
+        $(GNU_LIB)/strftime.h \
+        $(GNU_LIB)/verify.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/strftime.h \
-        $(EMACS_ROOT)/lib/verify.h \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(SYSTIME_H) \
+        $(WINDOW_H)
 
 $(BLD)/emacs.$(O) : \
         $(SRC)/emacs.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
+        $(SRC)/gnutls.h \
         $(SRC)/keymap.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
-        $(SRC)/termhooks.h \
         $(SRC)/unexec.h \
         $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/eval.$(O) : \
         $(SRC)/eval.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(BLOCKINPUT_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H)
 
 $(BLD)/fileio.$(O) : \
         $(SRC)/fileio.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(LISP_H) \
+        $(SYSTIME_H) \
+        $(WINDOW_H)
 
 $(BLD)/filelock.$(O) : \
         $(SRC)/filelock.c \
+        $(SRC)/buffer.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(CHARACTER_H) \
+        $(CODING_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
-        $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/systime.h
+        $(SYSTIME_H)
 
 $(BLD)/firstfile.$(O) : \
         $(SRC)/firstfile.c \
@@ -854,271 +835,213 @@ $(BLD)/firstfile.$(O) : \
 
 $(BLD)/floatfns.$(O) : \
         $(SRC)/floatfns.c \
+        $(SRC)/syssignal.h \
         $(CONFIG_H) \
-        $(LISP_H) \
-        $(SRC)/syssignal.h
+        $(LISP_H)
 
 $(BLD)/fns.$(O) : \
         $(SRC)/fns.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/langinfo.h \
-        $(EMACS_ROOT)/nt/inc/nl_types.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/md5.h \
-        $(EMACS_ROOT)/lib/sha1.h \
-        $(EMACS_ROOT)/lib/sha256.h \
-        $(EMACS_ROOT)/lib/sha512.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/intprops.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LANGINFO_H) \
+        $(LISP_H) \
+        $(MD5_H) \
+        $(SHA1_H) \
+        $(SHA256_H) \
+        $(SHA512_H) \
+        $(WINDOW_H)
 
 $(BLD)/font.$(O) : \
         $(SRC)/font.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/fontset.$(O) : \
         $(SRC)/fontset.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/frame.$(O) : \
         $(SRC)/frame.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/fringe.$(O) : \
         $(SRC)/fringe.c \
+        $(SRC)/buffer.h \
+        $(BLOCKINPUT_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/buffer.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/gmalloc.$(O) : \
         $(SRC)/gmalloc.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(SRC)/getpagesize.h
+        $(SRC)/getpagesize.h \
+        $(NT_INC)/unistd.h \
+        $(CONFIG_H)
 
 $(BLD)/gnutls.$(O) : \
         $(SRC)/gnutls.c \
+        $(SRC)/w32.h \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
         $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/w32.h
+        $(PROCESS_H)
 
 $(BLD)/image.$(O) : \
         $(SRC)/image.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/epaths.h \
-        $(SRC)/font.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
         $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(SYSTIME_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/indent.$(O) : \
         $(SRC)/indent.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/category.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
         $(SRC)/indent.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/region-cache.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/insdel.$(O) : \
         $(SRC)/insdel.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/intervals.h \
         $(SRC)/region-cache.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(GNU_LIB)/intprops.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(INTERVALS_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/intervals.$(O) : \
         $(SRC)/intervals.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/puresize.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(GNU_LIB)/intprops.h \
+        $(CONFIG_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H)
 
 $(BLD)/keyboard.$(O) : \
         $(SRC)/keyboard.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/macros.h \
         $(SRC)/puresize.h \
         $(SRC)/syntax.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/ioctl.h \
+        $(NT_INC)/unistd.h \
+        $(ATIMER_H) \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTIME_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/keymap.$(O) : \
         $(SRC)/keymap.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/puresize.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/lastfile.$(O) : \
         $(SRC)/lastfile.c \
@@ -1126,714 +1049,560 @@ $(BLD)/lastfile.$(O) : \
 
 $(BLD)/lread.$(O) : \
         $(SRC)/lread.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/epaths.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H)
 
 $(BLD)/macros.$(O) : \
         $(SRC)/macros.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/keyboard.h \
         $(SRC)/macros.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CONFIG_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/marker.$(O) : \
         $(SRC)/marker.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/menu.$(O) : \
         $(SRC)/menu.c \
+        $(SRC)/keymap.h \
+        $(BLOCKINPUT_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/keymap.h \
-        $(SRC)/menu.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(MENU_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/minibuf.$(O) : \
         $(SRC)/minibuf.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/syntax.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/w32.$(O) : \
         $(SRC)/w32.c \
+        $(SRC)/ndir.h \
+        $(SRC)/w32.h \
+        $(SRC)/w32heap.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/time.h \
+        $(GNU_LIB)/allocator.h \
+        $(CAREADLINKAT_H) \
+        $(CODING_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/grp.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/socket.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/allocator.h \
-        $(EMACS_ROOT)/lib/careadlinkat.h \
+        $(DISPEXTERN_H) \
+        $(GRP_H) \
         $(LISP_H) \
         $(PROCESS_H) \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/ndir.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32heap.h
+        $(SOCKET_H) \
+        $(SYSTIME_H)
 
 $(BLD)/w32heap.$(O) : \
         $(SRC)/w32heap.c \
+        $(SRC)/w32heap.h \
         $(CONFIG_H) \
-        $(LISP_H) \
-        $(SRC)/w32heap.h
+        $(LISP_H)
 
 $(BLD)/w32inevt.$(O) : \
         $(SRC)/w32inevt.c \
+        $(SRC)/w32heap.h \
+        $(BLOCKINPUT_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32heap.h \
-        $(SRC)/w32term.h
+        $(TERMHOOKS_H) \
+        $(W32TERM_H)
 
 $(BLD)/w32proc.$(O) : \
         $(SRC)/w32proc.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/langinfo.h \
-        $(EMACS_ROOT)/nt/inc/nl_types.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
         $(SRC)/syswait.h \
         $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
-        $(SRC)/w32term.h
+        $(NT_INC)/nl_types.h \
+        $(NT_INC)/sys/file.h \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(LANGINFO_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTIME_H) \
+        $(W32TERM_H)
 
 $(BLD)/w32console.$(O) : \
         $(SRC)/w32console.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32inevt.h
+        $(SRC)/w32inevt.h \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H)
 
 $(BLD)/print.$(O) : \
         $(SRC)/print.c \
+        $(SRC)/buffer.h \
+        $(SRC)/termchar.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/ftoastr.h \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(FTOASTR_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
         $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/process.$(O) : \
         $(SRC)/process.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/netdb.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/arpa/inet.h \
-        $(EMACS_ROOT)/nt/inc/netinet/in.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/socket.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
+        $(SRC)/gnutls.h \
         $(SRC)/sysselect.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
         $(SRC)/syswait.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/arpa/inet.h \
+        $(NT_INC)/netdb.h \
+        $(NT_INC)/netinet/in.h \
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/ioctl.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(ATIMER_H) \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SOCKET_H) \
+        $(SYSTIME_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/ralloc.$(O) : \
         $(SRC)/ralloc.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/getpagesize.h \
-        $(SRC)/systime.h
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/regex.$(O) : \
         $(SRC)/regex.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/category.h \
-        $(SRC)/character.h \
         $(SRC)/regex.h \
-        $(SRC)/syntax.h
+        $(SRC)/syntax.h \
+        $(NT_INC)/unistd.h \
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/region-cache.$(O) : \
         $(SRC)/region-cache.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
         $(SRC)/buffer.h \
-        $(SRC)/region-cache.h
+        $(SRC)/region-cache.h \
+        $(CONFIG_H) \
+        $(LISP_H)
 
 $(BLD)/scroll.$(O) : \
         $(SRC)/scroll.c \
+        $(SRC)/termchar.h \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/search.$(O) : \
         $(SRC)/search.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
         $(SRC)/category.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/intervals.h \
         $(SRC)/regex.h \
         $(SRC)/region-cache.h \
         $(SRC)/syntax.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(INTERVALS_H) \
+        $(LISP_H)
 
 $(BLD)/sound.$(O) : \
         $(SRC)/sound.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/dispextern.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(NT_INC)/unistd.h \
+        $(ATIMER_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(LISP_H)
 
 $(BLD)/syntax.$(O) : \
         $(SRC)/syntax.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/category.h \
-        $(SRC)/character.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/intervals.h \
         $(SRC)/keymap.h \
         $(SRC)/regex.h \
         $(SRC)/syntax.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h
+        $(CHARACTER_H) \
+        $(CONFIG_H) \
+        $(INTERVALS_H) \
+        $(LISP_H)
 
 $(BLD)/sysdep.$(O) : \
         $(SRC)/sysdep.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/grp.h \
-        $(EMACS_ROOT)/nt/inc/netdb.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/socket.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(EMACS_ROOT)/lib/allocator.h \
-        $(EMACS_ROOT)/lib/careadlinkat.h \
-        $(EMACS_ROOT)/lib/ignore-value.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/cm.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
         $(SRC)/sysselect.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
         $(SRC)/syswait.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/netdb.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/allocator.h \
+        $(GNU_LIB)/ignore-value.h \
+        $(BLOCKINPUT_H) \
+        $(CAREADLINKAT_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(GRP_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SOCKET_H) \
+        $(SYSTIME_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/term.$(O) : \
         $(SRC)/term.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
         $(SRC)/cm.h \
-        $(SRC)/coding.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/syssignal.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
         $(SRC)/tparam.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/unistd.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H) \
+        $(WINDOW_H)
 
 $(BLD)/terminal.$(O) : \
         $(SRC)/terminal.c \
+        $(SRC)/termchar.h \
+        $(CHARSET_H) \
+        $(CODING_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h
+        $(TERMHOOKS_H)
 
 $(BLD)/textprop.$(O) : \
         $(SRC)/textprop.c \
+        $(SRC)/buffer.h \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(INTERVALS_H) \
         $(LISP_H) \
-        $(SRC)/buffer.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/intervals.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(WINDOW_H)
 
 $(BLD)/tparam.$(O) : \
         $(SRC)/tparam.c \
+        $(SRC)/tparam.h \
         $(CONFIG_H) \
-        $(LISP_H) \
-        $(SRC)/tparam.h
+        $(LISP_H)
 
 $(BLD)/undo.$(O) : \
         $(SRC)/undo.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
         $(SRC)/buffer.h \
         $(SRC)/commands.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/window.h
+        $(CONFIG_H) \
+        $(LISP_H) \
+        $(WINDOW_H)
 
 $(BLD)/unexw32.$(O) : \
         $(SRC)/unexw32.c \
-        $(CONFIG_H) \
         $(SRC)/unexec.h \
-        $(SRC)/w32heap.h
+        $(SRC)/w32heap.h \
+        $(CONFIG_H)
 
 $(BLD)/vm-limit.$(O) : \
         $(SRC)/vm-limit.c \
+        $(SRC)/mem-limits.h \
         $(CONFIG_H) \
-        $(LISP_H) \
-        $(SRC)/mem-limits.h
+        $(LISP_H)
 
 $(BLD)/window.$(O) : \
         $(SRC)/window.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/frame.h \
         $(SRC)/indent.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/xdisp.$(O) : \
         $(SRC)/xdisp.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
         $(SRC)/indent.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
         $(SRC)/macros.h \
         $(SRC)/region-cache.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/xfaces.$(O) : \
         $(SRC)/xfaces.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/stat.h \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/w32fns.$(O) : \
         $(SRC)/w32fns.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/epaths.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
         $(SRC)/w32.h \
         $(SRC)/w32font.h \
-        $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(SYSTIME_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/w32menu.$(O) : \
         $(SRC)/w32menu.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(SRC)/menu.h \
-        $(SRC)/systime.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(BLOCKINPUT_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(MENU_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/w32term.$(O) : \
         $(SRC)/w32term.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
         $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
         $(SRC)/disptab.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/intervals.h \
-        $(SRC)/keyboard.h \
         $(SRC)/keymap.h \
-        $(SRC)/systime.h \
-        $(SRC)/systty.h \
         $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
         $(SRC)/termopts.h \
         $(SRC)/w32font.h \
-        $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
-        $(SRC)/w32term.h \
-        $(SRC)/window.h
+        $(NT_INC)/sys/stat.h \
+        $(ATIMER_H) \
+        $(BLOCKINPUT_H) \
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(INTERVALS_H) \
+        $(KEYBOARD_H) \
+        $(LISP_H) \
+        $(PROCESS_H) \
+        $(SYSTIME_H) \
+        $(SYSTTY_H) \
+        $(TERMHOOKS_H) \
+        $(W32TERM_H) \
+        $(WINDOW_H)
 
 $(BLD)/w32select.$(O) : \
         $(SRC)/w32select.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
         $(SRC)/composite.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
-        $(SRC)/w32term.h
+        $(BLOCKINPUT_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(LISP_H) \
+        $(W32TERM_H)
 
 $(BLD)/w32reg.$(O) : \
         $(SRC)/w32reg.c \
+        $(BLOCKINPUT_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h
+        $(W32TERM_H)
 
 $(BLD)/w32xfns.$(O) : \
         $(SRC)/w32xfns.c \
+        $(SRC)/fontset.h \
+        $(BLOCKINPUT_H) \
+        $(CHARSET_H) \
         $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(FRAME_H) \
+        $(KEYBOARD_H) \
         $(LISP_H) \
-        $(SRC)/atimer.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/keyboard.h \
-        $(SRC)/systime.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h
+        $(W32TERM_H)
 
 $(BLD)/w32font.$(O) : \
         $(SRC)/w32font.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
-        $(SRC)/coding.h \
-        $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
         $(SRC)/w32font.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CODING_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(W32TERM_H)
 
 $(BLD)/w32uniscribe.$(O) : \
         $(SRC)/w32uniscribe.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/sys/time.h \
-        $(LISP_H) \
-        $(SRC)/ccl.h \
-        $(SRC)/character.h \
-        $(SRC)/charset.h \
         $(SRC)/composite.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/font.h \
         $(SRC)/fontset.h \
-        $(SRC)/frame.h \
-        $(SRC)/systime.h \
         $(SRC)/w32font.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h
+        $(CHARACTER_H) \
+        $(CHARSET_H) \
+        $(CONFIG_H) \
+        $(DISPEXTERN_H) \
+        $(FONT_H) \
+        $(FRAME_H) \
+        $(LISP_H) \
+        $(W32TERM_H)
 
 # Each object file depends on stamp_BLD, because in parallel builds we must
 # make sure $(BLD) exists before starting compilations.
diff --git a/src/minibuf.c b/src/minibuf.c
index ca2f22df9ed..cf37c337be4 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -25,7 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"
-#include "character.h"
 #include "dispextern.h"
 #include "keyboard.h"
 #include "frame.h"
@@ -72,7 +71,6 @@ Lisp_Object Qcompletion_ignore_case;
 static Lisp_Object Qminibuffer_completion_table;
 static Lisp_Object Qminibuffer_completion_predicate;
 static Lisp_Object Qminibuffer_completion_confirm;
-static Lisp_Object Qcompleting_read_default;
 static Lisp_Object Quser_variable_p;
 
 static Lisp_Object Qminibuffer_default;
@@ -237,7 +235,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
                              Lisp_Object defalt,
                              int allow_props, int inherit_input_method)
 {
-  size_t size, len;
+  ptrdiff_t size, len;
   char *line, *s;
   Lisp_Object val;
 
@@ -247,12 +245,12 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
   val = Qnil;
   size = 100;
   len = 0;
-  line = (char *) xmalloc (size * sizeof *line);
+  line = (char *) xmalloc (size);
   while ((s = fgets (line + len, size - len, stdin)) != NULL
          && (len = strlen (line),
              len == size - 1 && line[len - 1] != '\n'))
     {
-      if ((size_t) -1 / 2 < size)
+      if (STRING_BYTES_BOUND / 2 < size)
         memory_full (SIZE_MAX);
       size *= 2;
       line = (char *) xrealloc (line, size);
@@ -260,11 +258,9 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
 
   if (s)
     {
-      len = strlen (line);
-
-      if (len > 0 && line[len - 1] == '\n')
-        line[--len] = '\0';
-
+      char *nl = strchr (line, '\n');
+      if (nl)
+        *nl = '\0';
       val = build_string (line);
       xfree (line);
     }
@@ -1694,7 +1690,7 @@ See also `completing-read-function'.  */)
   (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
 {
   Lisp_Object args[9];
-  args[0] = Vcompleting_read_function;
+  args[0] = Fsymbol_value (intern ("completing-read-function"));
   args[1] = prompt;
   args[2] = collection;
   args[3] = predicate;
@@ -1705,76 +1701,6 @@ See also `completing-read-function'.  */)
   args[8] = inherit_input_method;
   return Ffuncall (9, args);
 }
-
-DEFUN ("completing-read-default", Fcompleting_read_default, Scompleting_read_default, 2, 8, 0,
-       doc: /* Default method for reading from the minibuffer with completion.
-See `completing-read' for the meaning of the arguments.  */)
-  (Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
-{
-  Lisp_Object val, histvar, histpos, position;
-  Lisp_Object init;
-  int pos = 0;
-  int count = SPECPDL_INDEX ();
-  struct gcpro gcpro1;
-
-  init = initial_input;
-  GCPRO1 (def);
-
-  specbind (Qminibuffer_completion_table, collection);
-  specbind (Qminibuffer_completion_predicate, predicate);
-  specbind (Qminibuffer_completion_confirm,
-            EQ (require_match, Qt) ? Qnil : require_match);
-
-  position = Qnil;
-  if (!NILP (init))
-    {
-      if (CONSP (init))
-        {
-          position = Fcdr (init);
-          init = Fcar (init);
-        }
-      CHECK_STRING (init);
-      if (!NILP (position))
-        {
-          CHECK_NUMBER (position);
-          /* Convert to distance from end of input.  */
-          pos = XINT (position) - SCHARS (init);
-        }
-    }
-
-  if (SYMBOLP (hist))
-    {
-      histvar = hist;
-      histpos = Qnil;
-    }
-  else
-    {
-      histvar = Fcar_safe (hist);
-      histpos = Fcdr_safe (hist);
-    }
-  if (NILP (histvar))
-    histvar = Qminibuffer_history;
-  if (NILP (histpos))
-    XSETFASTINT (histpos, 0);
-
-  val = read_minibuf (NILP (require_match)
-                      ? (NILP (Vminibuffer_completing_file_name)
-                         || EQ (Vminibuffer_completing_file_name, Qlambda)
-                         ? Vminibuffer_local_completion_map
-                         : Vminibuffer_local_filename_completion_map)
-                      : (NILP (Vminibuffer_completing_file_name)
-                         || EQ (Vminibuffer_completing_file_name, Qlambda)
-                         ? Vminibuffer_local_must_match_map
-                         : Vminibuffer_local_filename_must_match_map),
-                      init, prompt, make_number (pos), 0,
-                      histvar, histpos, def, 0,
-                      !NILP (inherit_input_method));
-
-  if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (def))
-    val = CONSP (def) ? XCAR (def) : def;
-
-  RETURN_UNGCPRO (unbind_to (count, val));
-}
 
 Lisp_Object Fassoc_string (register Lisp_Object key, Lisp_Object list, Lisp_Object case_fold);
 
@@ -2013,7 +1939,6 @@ syms_of_minibuf (void)
   minibuf_save_list = Qnil;
   staticpro (&minibuf_save_list);
 
-  DEFSYM (Qcompleting_read_default, "completing-read-default");
   DEFSYM (Qcompletion_ignore_case, "completion-ignore-case");
   DEFSYM (Qread_file_name_internal, "read-file-name-internal");
   DEFSYM (Qminibuffer_default, "minibuffer-default");
@@ -2132,12 +2057,6 @@ If the value is `confirm-after-completion', the user may exit with an
                doc: /* Non-nil means completing file names.  */);
   Vminibuffer_completing_file_name = Qnil;
 
-  DEFVAR_LISP ("completing-read-function",
-               Vcompleting_read_function,
-               doc: /* The function called by `completing-read' to do the work.
-It should accept the same arguments as `completing-read'.  */);
-  Vcompleting_read_function = Qcompleting_read_default;
-
   DEFVAR_LISP ("minibuffer-help-form", Vminibuffer_help_form,
                doc: /* Value that `help-form' takes on inside the minibuffer.  */);
   Vminibuffer_help_form = Qnil;
@@ -2214,5 +2133,4 @@ properties.  */);
   defsubr (&Stest_completion);
   defsubr (&Sassoc_string);
   defsubr (&Scompleting_read);
-  defsubr (&Scompleting_read_default);
 }
diff --git a/src/msdos.c b/src/msdos.c
index 73804df55cc..3f12bc85cbe 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4267,8 +4267,7 @@ syms_of_msdos (void)
 #ifndef HAVE_X_WINDOWS
 
   /* The following two are from xfns.c:  */
-  Qreverse = intern_c_string ("reverse");
-  staticpro (&Qreverse);
+  DEFSYM (Qreverse, "reverse");
 
   DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph,
                doc: /* *Glyph to display instead of chars not supported by current codepage.
diff --git a/src/print.c b/src/print.c
index d07f89702cc..14b4326bb6f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -159,8 +159,9 @@ int print_output_debug_flag EXTERNALLY_VISIBLE = 1;
          }                                                              \
        else                                                             \
          {                                                              \
-           print_buffer_size = 1000;                                    \
-           print_buffer = (char *) xmalloc (print_buffer_size);         \
+           ptrdiff_t new_size = 1000;                                   \
+           print_buffer = (char *) xmalloc (new_size);                  \
+           print_buffer_size = new_size;                                \
            free_print_buffer = 1;                                       \
          }                                                              \
        print_buffer_pos = 0;                                            \
@@ -235,9 +236,15 @@ printchar (unsigned int ch, Lisp_Object fun)
 
       if (NILP (fun))
         {
-          if (print_buffer_pos_byte + len >= print_buffer_size)
-            print_buffer = (char *) xrealloc (print_buffer,
-                                              print_buffer_size *= 2);
+          if (print_buffer_size - len <= print_buffer_pos_byte)
+            {
+              ptrdiff_t new_size;
+              if (STRING_BYTES_BOUND / 2 < print_buffer_size)
+                string_overflow ();
+              new_size = print_buffer_size * 2;
+              print_buffer = (char *) xrealloc (print_buffer, new_size);
+              print_buffer_size = new_size;
+            }
           memcpy (print_buffer + print_buffer_pos_byte, str, len);
           print_buffer_pos += 1;
           print_buffer_pos_byte += len;
@@ -280,11 +287,14 @@ strout (const char *ptr, EMACS_INT size, EMACS_INT size_byte,
 
   if (NILP (printcharfun))
     {
-      if (print_buffer_pos_byte + size_byte > print_buffer_size)
+      if (print_buffer_size - size_byte < print_buffer_pos_byte)
         {
-          print_buffer_size = print_buffer_size * 2 + size_byte;
-          print_buffer = (char *) xrealloc (print_buffer,
-                                            print_buffer_size);
+          ptrdiff_t new_size;
+          if (STRING_BYTES_BOUND / 2 - size_byte < print_buffer_size)
+            string_overflow ();
+          new_size = print_buffer_size * 2 + size_byte;
+          print_buffer = (char *) xrealloc (print_buffer, new_size);
+          print_buffer_size = new_size;
         }
       memcpy (print_buffer + print_buffer_pos_byte, ptr, size_byte);
       print_buffer_pos += size;
@@ -2059,8 +2069,7 @@ print_interval (INTERVAL interval, Lisp_Object printcharfun)
 void
 syms_of_print (void)
 {
-  Qtemp_buffer_setup_hook = intern_c_string ("temp-buffer-setup-hook");
-  staticpro (&Qtemp_buffer_setup_hook);
+  DEFSYM (Qtemp_buffer_setup_hook, "temp-buffer-setup-hook");
 
   DEFVAR_LISP ("standard-output", Vstandard_output,
                doc: /* Output stream `print' uses by default for outputting a character.
@@ -2069,8 +2078,7 @@ It may also be a buffer (output is inserted before point)
 or a marker (output is inserted and the marker is advanced)
 or the symbol t (output appears in the echo area).  */);
   Vstandard_output = Qt;
-  Qstandard_output = intern_c_string ("standard-output");
-  staticpro (&Qstandard_output);
+  DEFSYM (Qstandard_output, "standard-output");
 
   DEFVAR_LISP ("float-output-format", Vfloat_output_format,
                doc: /* The format descriptor string used to print floats.
@@ -2089,8 +2097,7 @@ decimal point.  0 is not allowed with `e' or `g'.
 A value of nil means to use the shortest notation
 that represents the number without losing information.  */);
   Vfloat_output_format = Qnil;
-  Qfloat_output_format = intern_c_string ("float-output-format");
-  staticpro (&Qfloat_output_format);
+  DEFSYM (Qfloat_output_format, "float-output-format");
 
   DEFVAR_LISP ("print-length", Vprint_length,
                doc: /* Maximum length of list to print before abbreviating.
@@ -2195,17 +2202,10 @@ priorities.  */);
   defsubr (&Sredirect_debugging_output);
 #endif
 
-  Qexternal_debugging_output = intern_c_string ("external-debugging-output");
-  staticpro (&Qexternal_debugging_output);
-
-  Qprint_escape_newlines = intern_c_string ("print-escape-newlines");
-  staticpro (&Qprint_escape_newlines);
-
-  Qprint_escape_multibyte = intern_c_string ("print-escape-multibyte");
-  staticpro (&Qprint_escape_multibyte);
-
-  Qprint_escape_nonascii = intern_c_string ("print-escape-nonascii");
-  staticpro (&Qprint_escape_nonascii);
+  DEFSYM (Qexternal_debugging_output, "external-debugging-output");
+  DEFSYM (Qprint_escape_newlines, "print-escape-newlines");
+  DEFSYM (Qprint_escape_multibyte, "print-escape-multibyte");
+  DEFSYM (Qprint_escape_nonascii, "print-escape-nonascii");
 
   print_prune_charset_plist = Qnil;
   staticpro (&print_prune_charset_plist);
diff --git a/src/process.c b/src/process.c
index 0040d14a0f6..6bd168d8840 100644
--- a/src/process.c
+++ b/src/process.c
@@ -102,9 +102,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "gnutls.h"
 #endif
 
-#if defined (USE_GTK) || defined (HAVE_GCONF)
+#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
 #include "xgselect.h"
-#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
+#endif
 #ifdef HAVE_NS
 #include "nsterm.h"
 #endif
@@ -4479,13 +4479,19 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
             set_waiting_for_input (&timeout);
         }
 
+      /* Skip the `select' call if input is available and we're
+         waiting for keyboard input or a cell change (which can be
+         triggered by processing X events).  In the latter case, set
+         nfds to 1 to avoid breaking the loop.  */
       no_avail = 0;
-      if (read_kbd && detect_input_pending ())
+      if ((read_kbd || !NILP (wait_for_cell))
+          && detect_input_pending ())
         {
-          nfds = 0;
+          nfds = read_kbd ? 0 : 1;
           no_avail = 1;
         }
-      else
+
+      if (!no_avail)
         {
 
 #ifdef ADAPTIVE_READ_BUFFERING
@@ -4521,7 +4527,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
               process_output_skip = 0;
             }
 #endif
-#if defined (USE_GTK) || defined (HAVE_GCONF)
+#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
           nfds = xg_select
 #elif defined (HAVE_NS)
           nfds = ns_select
@@ -7236,14 +7242,10 @@ syms_of_process (void)
 {
 #ifdef subprocesses
 
-  Qprocessp = intern_c_string ("processp");
-  staticpro (&Qprocessp);
-  Qrun = intern_c_string ("run");
-  staticpro (&Qrun);
-  Qstop = intern_c_string ("stop");
-  staticpro (&Qstop);
-  Qsignal = intern_c_string ("signal");
-  staticpro (&Qsignal);
+  DEFSYM (Qprocessp, "processp");
+  DEFSYM (Qrun, "run");
+  DEFSYM (Qstop, "stop");
+  DEFSYM (Qsignal, "signal");
 
   /* Qexit is already staticpro'd by syms_of_eval; don't staticpro it
      here again.
@@ -7251,92 +7253,52 @@ syms_of_process (void)
      Qexit = intern_c_string ("exit");
      staticpro (&Qexit); */
 
-  Qopen = intern_c_string ("open");
-  staticpro (&Qopen);
-  Qclosed = intern_c_string ("closed");
-  staticpro (&Qclosed);
-  Qconnect = intern_c_string ("connect");
-  staticpro (&Qconnect);
-  Qfailed = intern_c_string ("failed");
-  staticpro (&Qfailed);
-  Qlisten = intern_c_string ("listen");
-  staticpro (&Qlisten);
-  Qlocal = intern_c_string ("local");
-  staticpro (&Qlocal);
-  Qipv4 = intern_c_string ("ipv4");
-  staticpro (&Qipv4);
+  DEFSYM (Qopen, "open");
+  DEFSYM (Qclosed, "closed");
+  DEFSYM (Qconnect, "connect");
+  DEFSYM (Qfailed, "failed");
+  DEFSYM (Qlisten, "listen");
+  DEFSYM (Qlocal, "local");
+  DEFSYM (Qipv4, "ipv4");
 #ifdef AF_INET6
-  Qipv6 = intern_c_string ("ipv6");
-  staticpro (&Qipv6);
-#endif
-  Qdatagram = intern_c_string ("datagram");
-  staticpro (&Qdatagram);
-  Qseqpacket = intern_c_string ("seqpacket");
-  staticpro (&Qseqpacket);
-
-  QCport = intern_c_string (":port");
-  staticpro (&QCport);
-  QCspeed = intern_c_string (":speed");
-  staticpro (&QCspeed);
-  QCprocess = intern_c_string (":process");
-  staticpro (&QCprocess);
-
-  QCbytesize = intern_c_string (":bytesize");
-  staticpro (&QCbytesize);
-  QCstopbits = intern_c_string (":stopbits");
-  staticpro (&QCstopbits);
-  QCparity = intern_c_string (":parity");
-  staticpro (&QCparity);
-  Qodd = intern_c_string ("odd");
-  staticpro (&Qodd);
-  Qeven = intern_c_string ("even");
-  staticpro (&Qeven);
-  QCflowcontrol = intern_c_string (":flowcontrol");
-  staticpro (&QCflowcontrol);
-  Qhw = intern_c_string ("hw");
-  staticpro (&Qhw);
-  Qsw = intern_c_string ("sw");
-  staticpro (&Qsw);
-  QCsummary = intern_c_string (":summary");
-  staticpro (&QCsummary);
-
-  Qreal = intern_c_string ("real");
-  staticpro (&Qreal);
-  Qnetwork = intern_c_string ("network");
-  staticpro (&Qnetwork);
-  Qserial = intern_c_string ("serial");
-  staticpro (&Qserial);
-  QCbuffer = intern_c_string (":buffer");
-  staticpro (&QCbuffer);
-  QChost = intern_c_string (":host");
-  staticpro (&QChost);
-  QCservice = intern_c_string (":service");
-  staticpro (&QCservice);
-  QClocal = intern_c_string (":local");
-  staticpro (&QClocal);
-  QCremote = intern_c_string (":remote");
-  staticpro (&QCremote);
-  QCcoding = intern_c_string (":coding");
-  staticpro (&QCcoding);
-  QCserver = intern_c_string (":server");
-  staticpro (&QCserver);
-  QCnowait = intern_c_string (":nowait");
-  staticpro (&QCnowait);
-  QCsentinel = intern_c_string (":sentinel");
-  staticpro (&QCsentinel);
-  QClog = intern_c_string (":log");
-  staticpro (&QClog);
-  QCnoquery = intern_c_string (":noquery");
-  staticpro (&QCnoquery);
-  QCstop = intern_c_string (":stop");
-  staticpro (&QCstop);
-  QCoptions = intern_c_string (":options");
-  staticpro (&QCoptions);
-  QCplist = intern_c_string (":plist");
-  staticpro (&QCplist);
-
-  Qlast_nonmenu_event = intern_c_string ("last-nonmenu-event");
-  staticpro (&Qlast_nonmenu_event);
+  DEFSYM (Qipv6, "ipv6");
+#endif
+  DEFSYM (Qdatagram, "datagram");
+  DEFSYM (Qseqpacket, "seqpacket");
+
+  DEFSYM (QCport, ":port");
+  DEFSYM (QCspeed, ":speed");
+  DEFSYM (QCprocess, ":process");
+
+  DEFSYM (QCbytesize, ":bytesize");
+  DEFSYM (QCstopbits, ":stopbits");
+  DEFSYM (QCparity, ":parity");
+  DEFSYM (Qodd, "odd");
+  DEFSYM (Qeven, "even");
+  DEFSYM (QCflowcontrol, ":flowcontrol");
+  DEFSYM (Qhw, "hw");
+  DEFSYM (Qsw, "sw");
+  DEFSYM (QCsummary, ":summary");
+
+  DEFSYM (Qreal, "real");
+  DEFSYM (Qnetwork, "network");
+  DEFSYM (Qserial, "serial");
+  DEFSYM (QCbuffer, ":buffer");
+  DEFSYM (QChost, ":host");
+  DEFSYM (QCservice, ":service");
+  DEFSYM (QClocal, ":local");
+  DEFSYM (QCremote, ":remote");
+  DEFSYM (QCcoding, ":coding");
+  DEFSYM (QCserver, ":server");
+  DEFSYM (QCnowait, ":nowait");
+  DEFSYM (QCsentinel, ":sentinel");
+  DEFSYM (QClog, ":log");
+  DEFSYM (QCnoquery, ":noquery");
+  DEFSYM (QCstop, ":stop");
+  DEFSYM (QCoptions, ":options");
+  DEFSYM (QCplist, ":plist");
+
+  DEFSYM (Qlast_nonmenu_event, "last-nonmenu-event");
 
   staticpro (&Vprocess_alist);
 #ifdef SIGCHLD
@@ -7345,73 +7307,40 @@ syms_of_process (void)
 
 #endif  /* subprocesses */
 
-  QCname = intern_c_string (":name");
-  staticpro (&QCname);
-  QCtype = intern_c_string (":type");
-  staticpro (&QCtype);
-
-  Qeuid = intern_c_string ("euid");
-  staticpro (&Qeuid);
-  Qegid = intern_c_string ("egid");
-  staticpro (&Qegid);
-  Quser = intern_c_string ("user");
-  staticpro (&Quser);
-  Qgroup = intern_c_string ("group");
-  staticpro (&Qgroup);
-  Qcomm = intern_c_string ("comm");
-  staticpro (&Qcomm);
-  Qstate = intern_c_string ("state");
-  staticpro (&Qstate);
-  Qppid = intern_c_string ("ppid");
-  staticpro (&Qppid);
-  Qpgrp = intern_c_string ("pgrp");
-  staticpro (&Qpgrp);
-  Qsess = intern_c_string ("sess");
-  staticpro (&Qsess);
-  Qttname = intern_c_string ("ttname");
-  staticpro (&Qttname);
-  Qtpgid = intern_c_string ("tpgid");
-  staticpro (&Qtpgid);
-  Qminflt = intern_c_string ("minflt");
-  staticpro (&Qminflt);
-  Qmajflt = intern_c_string ("majflt");
-  staticpro (&Qmajflt);
-  Qcminflt = intern_c_string ("cminflt");
-  staticpro (&Qcminflt);
-  Qcmajflt = intern_c_string ("cmajflt");
-  staticpro (&Qcmajflt);
-  Qutime = intern_c_string ("utime");
-  staticpro (&Qutime);
-  Qstime = intern_c_string ("stime");
-  staticpro (&Qstime);
-  Qtime = intern_c_string ("time");
-  staticpro (&Qtime);
-  Qcutime = intern_c_string ("cutime");
-  staticpro (&Qcutime);
-  Qcstime = intern_c_string ("cstime");
-  staticpro (&Qcstime);
-  Qctime = intern_c_string ("ctime");
-  staticpro (&Qctime);
-  Qpri = intern_c_string ("pri");
-  staticpro (&Qpri);
-  Qnice = intern_c_string ("nice");
-  staticpro (&Qnice);
-  Qthcount = intern_c_string ("thcount");
-  staticpro (&Qthcount);
-  Qstart = intern_c_string ("start");
-  staticpro (&Qstart);
-  Qvsize = intern_c_string ("vsize");
-  staticpro (&Qvsize);
-  Qrss = intern_c_string ("rss");
-  staticpro (&Qrss);
-  Qetime = intern_c_string ("etime");
-  staticpro (&Qetime);
-  Qpcpu = intern_c_string ("pcpu");
-  staticpro (&Qpcpu);
-  Qpmem = intern_c_string ("pmem");
-  staticpro (&Qpmem);
-  Qargs = intern_c_string ("args");
-  staticpro (&Qargs);
+  DEFSYM (QCname, ":name");
+  DEFSYM (QCtype, ":type");
+
+  DEFSYM (Qeuid, "euid");
+  DEFSYM (Qegid, "egid");
+  DEFSYM (Quser, "user");
+  DEFSYM (Qgroup, "group");
+  DEFSYM (Qcomm, "comm");
+  DEFSYM (Qstate, "state");
+  DEFSYM (Qppid, "ppid");
+  DEFSYM (Qpgrp, "pgrp");
+  DEFSYM (Qsess, "sess");
+  DEFSYM (Qttname, "ttname");
+  DEFSYM (Qtpgid, "tpgid");
+  DEFSYM (Qminflt, "minflt");
+  DEFSYM (Qmajflt, "majflt");
+  DEFSYM (Qcminflt, "cminflt");
+  DEFSYM (Qcmajflt, "cmajflt");
+  DEFSYM (Qutime, "utime");
+  DEFSYM (Qstime, "stime");
+  DEFSYM (Qtime, "time");
+  DEFSYM (Qcutime, "cutime");
+  DEFSYM (Qcstime, "cstime");
+  DEFSYM (Qctime, "ctime");
+  DEFSYM (Qpri, "pri");
+  DEFSYM (Qnice, "nice");
+  DEFSYM (Qthcount, "thcount");
+  DEFSYM (Qstart, "start");
+  DEFSYM (Qvsize, "vsize");
+  DEFSYM (Qrss, "rss");
+  DEFSYM (Qetime, "etime");
+  DEFSYM (Qpcpu, "pcpu");
+  DEFSYM (Qpmem, "pmem");
+  DEFSYM (Qargs, "args");
 
   DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes,
                doc: /* *Non-nil means delete processes immediately when they exit.
diff --git a/src/search.c b/src/search.c
index 6c835f2cc64..d29a51c695b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3181,10 +3181,8 @@ syms_of_search (void)
     }
   searchbuf_head = &searchbufs[0];
 
-  Qsearch_failed = intern_c_string ("search-failed");
-  staticpro (&Qsearch_failed);
-  Qinvalid_regexp = intern_c_string ("invalid-regexp");
-  staticpro (&Qinvalid_regexp);
+  DEFSYM (Qsearch_failed, "search-failed");
+  DEFSYM (Qinvalid_regexp, "invalid-regexp");
 
   Fput (Qsearch_failed, Qerror_conditions,
         pure_cons (Qsearch_failed, pure_cons (Qerror, Qnil)));
diff --git a/src/sound.c b/src/sound.c
index 0e71e66352e..07c7dab0ada 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1477,14 +1477,10 @@ Internal use only, use `play-sound' instead.  */)
 void
 syms_of_sound (void)
 {
-  QCdevice = intern_c_string(":device");
-  staticpro (&QCdevice);
-  QCvolume = intern_c_string (":volume");
-  staticpro (&QCvolume);
-  Qsound = intern_c_string ("sound");
-  staticpro (&Qsound);
-  Qplay_sound_functions = intern_c_string ("play-sound-functions");
-  staticpro (&Qplay_sound_functions);
+  DEFSYM (QCdevice, ":device");
+  DEFSYM (QCvolume, ":volume");
+  DEFSYM (Qsound, "sound");
+  DEFSYM (Qplay_sound_functions, "play-sound-functions");
 
   defsubr (&Splay_sound_internal);
 }
diff --git a/src/syntax.c b/src/syntax.c
index 82103cfa3d4..8c2d5ded21f 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3362,8 +3362,7 @@ init_syntax_once (void)
   Lisp_Object temp;
 
   /* This has to be done here, before we call Fmake_char_table.  */
-  Qsyntax_table = intern_c_string ("syntax-table");
-  staticpro (&Qsyntax_table);
+  DEFSYM (Qsyntax_table, "syntax-table");
 
   /* Intern_C_String this now in case it isn't already done.
      Setting this variable twice is harmless.
@@ -3448,8 +3447,7 @@ init_syntax_once (void)
 void
 syms_of_syntax (void)
 {
-  Qsyntax_table_p = intern_c_string ("syntax-table-p");
-  staticpro (&Qsyntax_table_p);
+  DEFSYM (Qsyntax_table_p, "syntax-table-p");
 
   staticpro (&Vsyntax_code_object);
 
@@ -3461,8 +3459,7 @@ syms_of_syntax (void)
   /* Defined in regex.c */
   staticpro (&re_match_object);
 
-  Qscan_error = intern_c_string ("scan-error");
-  staticpro (&Qscan_error);
+  DEFSYM (Qscan_error, "scan-error");
   Fput (Qscan_error, Qerror_conditions,
         pure_cons (Qscan_error, pure_cons (Qerror, Qnil)));
   Fput (Qscan_error, Qerror_message,
diff --git a/src/sysdep.c b/src/sysdep.c
index 5ad3389dd8f..8b6939b91fe 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1783,7 +1783,8 @@ seed_random (long int arg)
 }
 
 /*
- * Build a full Emacs-sized word out of whatever we've got.
+ * Return a nonnegative random integer out of whatever we've got.
+ * It contains enough bits to make a random (signed) Emacs fixnum.
  * This suffices even for a 64-bit architecture with a 15-bit rand.
  */
 EMACS_INT
@@ -1791,9 +1792,11 @@ get_random (void)
 {
   EMACS_UINT val = 0;
   int i;
-  for (i = 0; i < (VALBITS + RAND_BITS - 1) / RAND_BITS; i++)
-    val = (val << RAND_BITS) ^ random ();
-  return val & (((EMACS_INT) 1 << VALBITS) - 1);
+  for (i = 0; i < (FIXNUM_BITS + RAND_BITS - 1) / RAND_BITS; i++)
+    val = (random () ^ (val << RAND_BITS)
+           ^ (val >> (BITS_PER_EMACS_INT - RAND_BITS)));
+  val ^= val >> (BITS_PER_EMACS_INT - FIXNUM_BITS);
+  return val & INTMASK;
 }
 
 #ifndef HAVE_STRERROR
@@ -2012,37 +2015,6 @@ perror (void)
 }
 #endif /* HPUX and not HAVE_PERROR */
 
-#ifndef HAVE_DUP2
-
-/*
- *      Emulate BSD dup2.  First close newd if it already exists.
- *      Then, attempt to dup oldd.  If not successful, call dup2 recursively
- *      until we are, then close the unsuccessful ones.
- */
-
-int
-dup2 (int oldd, int newd)
-{
-  register int fd, ret;
-
-  emacs_close (newd);
-
-#ifdef F_DUPFD
-  return fcntl (oldd, F_DUPFD, newd);
-#else
-  fd = dup (old);
-  if (fd == -1)
-    return -1;
-  if (fd == new)
-    return new;
-  ret = dup2 (old,new);
-  emacs_close (fd);
-  return ret;
-#endif
-}
-
-#endif /* not HAVE_DUP2 */
-
 /*
  *      Gettimeofday.  Simulate as much as possible.  Only accurate
  *      to nearest second.  Emacs doesn't use tzp so ignore it for now.
diff --git a/src/terminal.c b/src/terminal.c
index c135c0f93ef..67577adf3b4 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -555,10 +555,8 @@ Each function is called with argument, the terminal.
 This may be called just before actually deleting the terminal,
 or some time later.  */);
   Vdelete_terminal_functions = Qnil;
-  Qdelete_terminal_functions = intern_c_string ("delete-terminal-functions");
-  staticpro (&Qdelete_terminal_functions);
-  Qrun_hook_with_args = intern_c_string ("run-hook-with-args");
-  staticpro (&Qrun_hook_with_args);
+  DEFSYM (Qdelete_terminal_functions, "delete-terminal-functions");
+  DEFSYM (Qrun_hook_with_args, "run-hook-with-args");
 
   defsubr (&Sdelete_terminal);
   defsubr (&Sframe_terminal);
diff --git a/src/textprop.c b/src/textprop.c
index dd8695f7af8..29425f7a550 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1707,10 +1707,14 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
 {
   Lisp_Object prev_pos, front_sticky;
   int is_rear_sticky = 1, is_front_sticky = 0; /* defaults */
+  Lisp_Object defalt = Fassq (prop, Vtext_property_default_nonsticky);
 
   if (NILP (buffer))
     XSETBUFFER (buffer, current_buffer);
 
+  if (CONSP (defalt) && !NILP (XCDR (defalt)))
+    is_rear_sticky = 0;
+
   if (XINT (pos) > BUF_BEGV (XBUFFER (buffer)))
     /* Consider previous character.  */
     {
@@ -2230,9 +2234,11 @@ If a character in a buffer has PROPERTY, new text inserted adjacent to
 the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil,
 inherits it if NONSTICKINESS is nil.  The `front-sticky' and
 `rear-nonsticky' properties of the character override NONSTICKINESS.  */);
-  /* Text property `syntax-table' should be nonsticky by default.  */
+  /* Text properties `syntax-table'and `display' should be nonsticky
+     by default.  */
   Vtext_property_default_nonsticky
-    = Fcons (Fcons (intern_c_string ("syntax-table"), Qt), Qnil);
+    = Fcons (Fcons (intern_c_string ("syntax-table"), Qt),
+             Fcons (Fcons (intern_c_string ("display"), Qt), Qnil));
 
   staticpro (&interval_insert_behind_hooks);
   staticpro (&interval_insert_in_front_hooks);
@@ -2242,45 +2248,27 @@ inherits it if NONSTICKINESS is nil.  The `front-sticky' and
 
   /* Common attributes one might give text */
 
-  staticpro (&Qforeground);
-  Qforeground = intern_c_string ("foreground");
-  staticpro (&Qbackground);
-  Qbackground = intern_c_string ("background");
-  staticpro (&Qfont);
-  Qfont = intern_c_string ("font");
-  staticpro (&Qstipple);
-  Qstipple = intern_c_string ("stipple");
-  staticpro (&Qunderline);
-  Qunderline = intern_c_string ("underline");
-  staticpro (&Qread_only);
-  Qread_only = intern_c_string ("read-only");
-  staticpro (&Qinvisible);
-  Qinvisible = intern_c_string ("invisible");
-  staticpro (&Qintangible);
-  Qintangible = intern_c_string ("intangible");
-  staticpro (&Qcategory);
-  Qcategory = intern_c_string ("category");
-  staticpro (&Qlocal_map);
-  Qlocal_map = intern_c_string ("local-map");
-  staticpro (&Qfront_sticky);
-  Qfront_sticky = intern_c_string ("front-sticky");
-  staticpro (&Qrear_nonsticky);
-  Qrear_nonsticky = intern_c_string ("rear-nonsticky");
-  staticpro (&Qmouse_face);
-  Qmouse_face = intern_c_string ("mouse-face");
-  staticpro (&Qminibuffer_prompt);
-  Qminibuffer_prompt = intern_c_string ("minibuffer-prompt");
+  DEFSYM (Qforeground, "foreground");
+  DEFSYM (Qbackground, "background");
+  DEFSYM (Qfont, "font");
+  DEFSYM (Qstipple, "stipple");
+  DEFSYM (Qunderline, "underline");
+  DEFSYM (Qread_only, "read-only");
+  DEFSYM (Qinvisible, "invisible");
+  DEFSYM (Qintangible, "intangible");
+  DEFSYM (Qcategory, "category");
+  DEFSYM (Qlocal_map, "local-map");
+  DEFSYM (Qfront_sticky, "front-sticky");
+  DEFSYM (Qrear_nonsticky, "rear-nonsticky");
+  DEFSYM (Qmouse_face, "mouse-face");
+  DEFSYM (Qminibuffer_prompt, "minibuffer-prompt");
 
   /* Properties that text might use to specify certain actions */
 
-  staticpro (&Qmouse_left);
-  Qmouse_left = intern_c_string ("mouse-left");
-  staticpro (&Qmouse_entered);
-  Qmouse_entered = intern_c_string ("mouse-entered");
-  staticpro (&Qpoint_left);
-  Qpoint_left = intern_c_string ("point-left");
-  staticpro (&Qpoint_entered);
-  Qpoint_entered = intern_c_string ("point-entered");
+  DEFSYM (Qmouse_left, "mouse-left");
+  DEFSYM (Qmouse_entered, "mouse-entered");
+  DEFSYM (Qpoint_left, "point-left");
+  DEFSYM (Qpoint_entered, "point-entered");
 
   defsubr (&Stext_properties_at);
   defsubr (&Sget_text_property);
diff --git a/src/undo.c b/src/undo.c
index e7e9ae5632e..7e121e8b27d 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -637,11 +637,8 @@ Return what remains of the list.  */)
 void
 syms_of_undo (void)
 {
-  Qinhibit_read_only = intern_c_string ("inhibit-read-only");
-  staticpro (&Qinhibit_read_only);
-
-  Qapply = intern_c_string ("apply");
-  staticpro (&Qapply);
+  DEFSYM (Qinhibit_read_only, "inhibit-read-only");
+  DEFSYM (Qapply, "apply");
 
   pending_boundary = Qnil;
   staticpro (&pending_boundary);
diff --git a/src/w32.c b/src/w32.c
index d81fdf3305d..53bf2e811e2 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -5960,8 +5960,7 @@ globals_of_w32 (void)
   get_process_times_fn = (GetProcessTimes_Proc)
     GetProcAddress (kernel32, "GetProcessTimes");
 
-  QCloaded_from = intern_c_string (":loaded-from");
-  staticpro (&QCloaded_from);
+  DEFSYM (QCloaded_from, ":loaded-from");
 
   Vlibrary_cache = Qnil;
   staticpro (&Vlibrary_cache);
diff --git a/src/w32fns.c b/src/w32fns.c
index e4b11b70441..cba0b91e685 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6805,10 +6805,6 @@ syms_of_w32fns (void)
   DEFSYM (Qfont_param, "font-parameter");
   /* This is the end of symbol initialization.  */
 
-  /* Text property `display' should be nonsticky by default.  */
-  Vtext_property_default_nonsticky
-    = Fcons (Fcons (Qdisplay, Qt), Vtext_property_default_nonsticky);
-
 
   Fput (Qundefined_color, Qerror_conditions,
         pure_cons (Qundefined_color, pure_cons (Qerror, Qnil)));
diff --git a/src/w32menu.c b/src/w32menu.c
index e2f6de7f0c8..c31a8c1fd96 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -33,7 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "buffer.h"
 #include "charset.h"
-#include "character.h"
 #include "coding.h"
 #include "menu.h"
 
diff --git a/src/w32proc.c b/src/w32proc.c
index e94d9aa3254..47cbf57d9ea 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -51,7 +51,6 @@ extern BOOL WINAPI IsValidLocale (LCID, DWORD);
 #endif
 
 #include "lisp.h"
-#include "character.h"
 #include "w32.h"
 #include "w32heap.h"
 #include "systime.h"
diff --git a/src/w32select.c b/src/w32select.c
index ef0cb3adc24..e3225c3f996 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -80,7 +80,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "charset.h"
 #include "coding.h"
-#include "character.h"
 #include "composite.h"
 
 
diff --git a/src/window.c b/src/window.c
index 65df9f26e64..154efe4a222 100644
--- a/src/window.c
+++ b/src/window.c
@@ -54,7 +54,7 @@ Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
 static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
 static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
-static Lisp_Object Qresize_root_window, Qresize_root_window_vertically;
+static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;
 static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
 static Lisp_Object Qsafe, Qabove, Qbelow;
 static Lisp_Object Qauto_buffer_name;
@@ -82,8 +82,8 @@ static int foreach_window_1 (struct window *,
                              int (* fn) (struct window *, void *),
                              void *);
 static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
-static int resize_window_check (struct window *, int);
-static void resize_window_apply (struct window *, int);
+static int window_resize_check (struct window *, int);
+static void window_resize_apply (struct window *, int);
 static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
 
 /* This is the window in which the terminal's cursor should
@@ -408,14 +408,6 @@ buffer of the selected window before each command.  */)
   return select_window (window, norecord, 0);
 }
 
-DEFUN ("window-clone-number", Fwindow_clone_number, Swindow_clone_number, 0, 1, 0,
-       doc: /* Return WINDOW's clone number.
-WINDOW can be any window and defaults to the selected one.  */)
-     (Lisp_Object window)
-{
-  return decode_any_window (window)->clone_number;
-}
-
 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
        doc: /* Return the buffer that WINDOW is displaying.
 WINDOW can be any window and defaults to the selected one.
@@ -434,37 +426,37 @@ Return nil if WINDOW has no parent.  */)
   return decode_any_window (window)->parent;
 }
 
-DEFUN ("window-vchild", Fwindow_vchild, Swindow_vchild, 0, 1, 0,
-       doc: /* Return WINDOW's first vertical child window.
+DEFUN ("window-top-child", Fwindow_top_child, Swindow_top_child, 0, 1, 0,
+       doc: /* Return WINDOW's topmost child window.
 WINDOW can be any window and defaults to the selected one.
-Return nil if WINDOW has no vertical child.  */)
+Return nil if WINDOW is not a vertical combination.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->vchild;
 }
 
-DEFUN ("window-hchild", Fwindow_hchild, Swindow_hchild, 0, 1, 0,
-       doc: /* Return WINDOW's first horizontal child window.
+DEFUN ("window-left-child", Fwindow_left_child, Swindow_left_child, 0, 1, 0,
+       doc: /* Return WINDOW's leftmost child window.
 WINDOW can be any window and defaults to the selected one.
-Return nil if WINDOW has no horizontal child.  */)
+Return nil if WINDOW is not a horizontal combination.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->hchild;
 }
 
-DEFUN ("window-next", Fwindow_next, Swindow_next, 0, 1, 0,
-       doc: /* Return WINDOW's right sibling window.
+DEFUN ("window-next-sibling", Fwindow_next_sibling, Swindow_next_sibling, 0, 1, 0,
+       doc: /* Return WINDOW's next sibling window.
 WINDOW can be any window and defaults to the selected one.
-Return nil if WINDOW has no right sibling.  */)
+Return nil if WINDOW has no next sibling.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->next;
 }
 
-DEFUN ("window-prev", Fwindow_prev, Swindow_prev, 0, 1, 0,
-       doc: /* Return WINDOW's left sibling window.
+DEFUN ("window-prev-sibling", Fwindow_prev_sibling, Swindow_prev_sibling, 0, 1, 0,
+       doc: /* Return WINDOW's previous sibling window.
 WINDOW can be any window and defaults to the selected one.
-Return nil if WINDOW has no left sibling.  */)
+Return nil if WINDOW has no previous sibling.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->prev;
@@ -2576,7 +2568,7 @@ selected frame and no others.  */)
 static Lisp_Object
 resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizontal, Lisp_Object ignore)
 {
-  return call4 (Qresize_root_window, window, delta, horizontal, ignore);
+  return call4 (Qwindow_resize_root_window, window, delta, horizontal, ignore);
 }
 
 
@@ -2695,13 +2687,13 @@ window-start value is reasonable when this function is called.  */)
       XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines));
       w->top_line = r->top_line;
       resize_root_window (window, delta, Qnil, Qnil);
-      if (resize_window_check (w, 0))
-        resize_window_apply (w, 0);
+      if (window_resize_check (w, 0))
+        window_resize_apply (w, 0);
       else
         {
           resize_root_window (window, delta, Qnil, Qt);
-          if (resize_window_check (w, 0))
-            resize_window_apply (w, 0);
+          if (window_resize_check (w, 0))
+            window_resize_apply (w, 0);
           else
             resize_failed = 1;
         }
@@ -2713,13 +2705,13 @@ window-start value is reasonable when this function is called.  */)
           XSETINT (delta, XINT (r->total_cols) - XINT (w->total_cols));
           w->left_col = r->left_col;
           resize_root_window (window, delta, Qt, Qnil);
-          if (resize_window_check (w, 1))
-            resize_window_apply (w, 1);
+          if (window_resize_check (w, 1))
+            window_resize_apply (w, 1);
           else
             {
               resize_root_window (window, delta, Qt, Qt);
-              if (resize_window_check (w, 1))
-                resize_window_apply (w, 1);
+              if (window_resize_check (w, 1))
+                window_resize_apply (w, 1);
               else
                 resize_failed = 1;
             }
@@ -3087,18 +3079,6 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int
   unbind_to (count, Qnil);
 }
 
-DEFUN ("set-window-clone-number", Fset_window_clone_number, Sset_window_clone_number, 2, 2, 0,
-       doc: /* Set WINDOW's clone number to CLONE-NUMBER.
-WINDOW can be any window and defaults to the selected one.  */)
-     (Lisp_Object window, Lisp_Object clone_number)
-{
-  register struct window *w = decode_any_window (window);
-
-  CHECK_NUMBER (clone_number);
-  w->clone_number = clone_number;
-  return w->clone_number;
-}
-
 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
        doc: /* Make WINDOW display BUFFER-OR-NAME as its contents.
 WINDOW has to be a live window and defaults to the selected one.
@@ -3289,7 +3269,6 @@ make_parent_window (Lisp_Object window, int horflag)
 
   ++sequence_number;
   XSETFASTINT (p->sequence_number, sequence_number);
-  XSETFASTINT (p->clone_number, sequence_number);
 
   replace_window (window, parent, 1);
 
@@ -3335,7 +3314,6 @@ make_window (void)
   XSETFASTINT (w->use_time, 0);
   ++sequence_number;
   XSETFASTINT (w->sequence_number, sequence_number);
-  XSETFASTINT (w->clone_number, sequence_number);
   w->temslot = w->last_modified = w->last_overlay_modified = Qnil;
   XSETFASTINT (w->last_point, 0);
   w->last_had_star = w->vertical_scroll_bar = Qnil;
@@ -3415,7 +3393,7 @@ Note: This function does not operate on any subwindows of WINDOW.  */)
    `window-min-height' or `window-min-width'.  It does check that window
    sizes do not drop below one line (two columns). */
 static int
-resize_window_check (struct window *w, int horflag)
+window_resize_check (struct window *w, int horflag)
 {
   struct window *c;
 
@@ -3429,7 +3407,7 @@ resize_window_check (struct window *w, int horflag)
           while (c)
             {
               if ((XINT (c->new_total) != XINT (w->new_total))
-                  || !resize_window_check (c, horflag))
+                  || !window_resize_check (c, horflag))
                 return 0;
               c = NILP (c->next) ? 0 : XWINDOW (c->next);
             }
@@ -3442,7 +3420,7 @@ resize_window_check (struct window *w, int horflag)
           int sum_of_sizes = 0;
           while (c)
             {
-              if (!resize_window_check (c, horflag))
+              if (!window_resize_check (c, horflag))
                 return 0;
               sum_of_sizes = sum_of_sizes + XINT (c->new_total);
               c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3461,7 +3439,7 @@ resize_window_check (struct window *w, int horflag)
           int sum_of_sizes = 0;
           while (c)
             {
-              if (!resize_window_check (c, horflag))
+              if (!window_resize_check (c, horflag))
                 return 0;
               sum_of_sizes = sum_of_sizes + XINT (c->new_total);
               c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3474,7 +3452,7 @@ resize_window_check (struct window *w, int horflag)
           while (c)
             {
               if ((XINT (c->new_total) != XINT (w->new_total))
-                  || !resize_window_check (c, horflag))
+                  || !window_resize_check (c, horflag))
                 return 0;
               c = NILP (c->next) ? 0 : XWINDOW (c->next);
             }
@@ -3494,9 +3472,9 @@ resize_window_check (struct window *w, int horflag)
    each of these windows.
 
    This function does not perform any error checks.  Make sure you have
-   run resize_window_check on W before applying this function.  */
+   run window_resize_check on W before applying this function.  */
 static void
-resize_window_apply (struct window *w, int horflag)
+window_resize_apply (struct window *w, int horflag)
 {
   struct window *c;
   int pos;
@@ -3530,7 +3508,7 @@ resize_window_apply (struct window *w, int horflag)
             XSETFASTINT (c->left_col, pos);
           else
             XSETFASTINT (c->top_line, pos);
-          resize_window_apply (c, horflag);
+          window_resize_apply (c, horflag);
           if (!horflag)
             pos = pos + XINT (c->total_lines);
           c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3546,7 +3524,7 @@ resize_window_apply (struct window *w, int horflag)
             XSETFASTINT (c->left_col, pos);
           else
             XSETFASTINT (c->top_line, pos);
-          resize_window_apply (c, horflag);
+          window_resize_apply (c, horflag);
           if (horflag)
             pos = pos + XINT (c->total_cols);
           c = NILP (c->next) ? 0 : XWINDOW (c->next);
@@ -3559,7 +3537,7 @@ resize_window_apply (struct window *w, int horflag)
 }
 
 
-DEFUN ("resize-window-apply", Fresize_window_apply, Sresize_window_apply, 1, 2, 0,
+DEFUN ("window-resize-apply", Fwindow_resize_apply, Swindow_resize_apply, 1, 2, 0,
        doc: /* Apply requested size values for window-tree of FRAME.
 Optional argument HORIZONTAL omitted or nil means apply requested height
 values.  HORIZONTAL non-nil means apply requested width values.
@@ -3584,12 +3562,12 @@ be applied on the Elisp level.  */)
   f = XFRAME (frame);
   r = XWINDOW (FRAME_ROOT_WINDOW (f));
 
-  if (!resize_window_check (r, horflag)
+  if (!window_resize_check (r, horflag)
       || ! EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
     return Qnil;
 
   BLOCK_INPUT;
-  resize_window_apply (r, horflag);
+  window_resize_apply (r, horflag);
 
   windows_or_buffers_changed++;
   FRAME_WINDOW_SIZES_CHANGED (f) = 1;
@@ -3641,22 +3619,22 @@ resize_frame_windows (struct frame *f, int size, int horflag)
       XSETINT (delta, new_size - old_size);
       /* Try a "normal" resize first.  */
       resize_root_window (root, delta, horflag ? Qt : Qnil, Qnil);
-      if (resize_window_check (r, horflag) && new_size == XINT (r->new_total))
-        resize_window_apply (r, horflag);
+      if (window_resize_check (r, horflag) && new_size == XINT (r->new_total))
+        window_resize_apply (r, horflag);
       else
         {
           /* Try with "reasonable" minimum sizes next.  */
           resize_root_window (root, delta, horflag ? Qt : Qnil, Qt);
-          if (resize_window_check (r, horflag)
+          if (window_resize_check (r, horflag)
               && new_size == XINT (r->new_total))
-            resize_window_apply (r, horflag);
+            window_resize_apply (r, horflag);
           else
             {
               /* Finally, try with "safe" minimum sizes.  */
               resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe);
-              if (resize_window_check (r, horflag)
+              if (window_resize_check (r, horflag)
                   && new_size == XINT (r->new_total))
-                resize_window_apply (r, horflag);
+                window_resize_apply (r, horflag);
               else
                 {
                   /* We lost.  Delete all windows but the frame's
@@ -3765,7 +3743,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
       XSETINT (p->new_total,
                XINT (horflag ? p->total_cols : p->total_lines)
                - XINT (total_size));
-      if (!resize_window_check (p, horflag))
+      if (!window_resize_check (p, horflag))
         error ("Window sizes don't fit");
       else
         /* Undo the temporary pretension.  */
@@ -3773,7 +3751,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
     }
   else
     {
-      if (!resize_window_check (o, horflag))
+      if (!window_resize_check (o, horflag))
         error ("Resizing old window failed");
       else if (XINT (total_size) + XINT (o->new_total)
                != XINT (horflag ? o->total_cols : o->total_lines))
@@ -3861,13 +3839,13 @@ set correctly.  See the code of `split-window' for how this is done.  */)
       n->total_cols = o->total_cols;
     }
 
-  /* Iso-coordinates and sizes are assigned by resize_window_apply,
+  /* Iso-coordinates and sizes are assigned by window_resize_apply,
      get them ready here.  */
   n->new_total = total_size;
   n->new_normal = normal_size;
 
   BLOCK_INPUT;
-  resize_window_apply (p, horflag);
+  window_resize_apply (p, horflag);
   adjust_glyphs (f);
   /* Set buffer of NEW to buffer of reference window.  Don't run
      any hooks.  */
@@ -3945,13 +3923,13 @@ when WINDOW is the only window on its frame.  */)
         XWINDOW (s->next)->prev = sibling;
     }
 
-  if (resize_window_check (r, horflag)
+  if (window_resize_check (r, horflag)
       && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
     /* We can delete WINDOW now.  */
     {
       /* Block input.  */
       BLOCK_INPUT;
-      resize_window_apply (p, horflag);
+      window_resize_apply (p, horflag);
 
       windows_or_buffers_changed++;
       Vwindow_list = Qnil;
@@ -4073,11 +4051,12 @@ grow_mini_window (struct window *w, int delta)
 
   root = FRAME_ROOT_WINDOW (f);
   r = XWINDOW (root);
-  value = call2 (Qresize_root_window_vertically, root, make_number (- delta));
-  if (INTEGERP (value) && resize_window_check (r, 0))
+  value = call2 (Qwindow_resize_root_window_vertically,
+                 root, make_number (- delta));
+  if (INTEGERP (value) && window_resize_check (r, 0))
     {
       BLOCK_INPUT;
-      resize_window_apply (r, 0);
+      window_resize_apply (r, 0);
 
       /* Grow the mini-window.  */
       XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines));
@@ -4107,12 +4086,12 @@ shrink_mini_window (struct window *w)
     {
       root = FRAME_ROOT_WINDOW (f);
       r = XWINDOW (root);
-      value = call2 (Qresize_root_window_vertically,
+      value = call2 (Qwindow_resize_root_window_vertically,
                      root, make_number (size - 1));
-      if (INTEGERP (value) && resize_window_check (r, 0))
+      if (INTEGERP (value) && window_resize_check (r, 0))
         {
           BLOCK_INPUT;
-          resize_window_apply (r, 0);
+          window_resize_apply (r, 0);
 
           /* Shrink the mini-window.  */
           XSETFASTINT (w->top_line, XFASTINT (r->top_line) + XFASTINT (r->total_lines));
@@ -4150,12 +4129,12 @@ DEFUN ("resize-mini-window-internal", Fresize_mini_window_internal, Sresize_mini
 
   r = XWINDOW (FRAME_ROOT_WINDOW (f));
   height = XINT (r->total_lines) + XINT (w->total_lines);
-  if (resize_window_check (r, 0)
+  if (window_resize_check (r, 0)
       && XINT (w->new_total) > 0
       && height == XINT (r->new_total) + XINT (w->new_total))
     {
       BLOCK_INPUT;
-      resize_window_apply (r, 0);
+      window_resize_apply (r, 0);
 
       w->total_lines = w->new_total;
       XSETFASTINT (w->top_line, XINT (r->top_line) + XINT (r->total_lines));
@@ -5347,8 +5326,7 @@ struct saved_window
 {
   struct vectorlike_header header;
 
-  Lisp_Object window, clone_number;
-  Lisp_Object buffer, start, pointm, mark;
+  Lisp_Object window, buffer, start, pointm, mark;
   Lisp_Object left_col, top_line, total_cols, total_lines;
   Lisp_Object normal_cols, normal_lines;
   Lisp_Object hscroll, min_hscroll;
@@ -5567,7 +5545,6 @@ the return value is nil.  Otherwise the value is t.  */)
                 }
             }
 
-          w->clone_number = p->clone_number;
           /* If we squirreled away the buffer in the window's height,
              restore it now.  */
           if (BUFFERP (w->total_lines))
@@ -5850,7 +5827,6 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
 
       XSETFASTINT (w->temslot, i); i++;
       p->window = window;
-      p->clone_number = w->clone_number;
       p->buffer = w->buffer;
       p->left_col = w->left_col;
       p->top_line = w->top_line;
@@ -6441,69 +6417,30 @@ init_window (void)
 void
 syms_of_window (void)
 {
-  Qscroll_up = intern_c_string ("scroll-up");
-  staticpro (&Qscroll_up);
-
-  Qscroll_down = intern_c_string ("scroll-down");
-  staticpro (&Qscroll_down);
-
-  Qscroll_command = intern_c_string ("scroll-command");
-  staticpro (&Qscroll_command);
+  DEFSYM (Qscroll_up, "scroll-up");
+  DEFSYM (Qscroll_down, "scroll-down");
+  DEFSYM (Qscroll_command, "scroll-command");
 
   Fput (Qscroll_up, Qscroll_command, Qt);
   Fput (Qscroll_down, Qscroll_command, Qt);
 
-  staticpro (&Qwindow_configuration_change_hook);
-  Qwindow_configuration_change_hook
-    = intern_c_string ("window-configuration-change-hook");
-
-  Qwindowp = intern_c_string ("windowp");
-  staticpro (&Qwindowp);
-
-  Qwindow_configuration_p = intern_c_string ("window-configuration-p");
-  staticpro (&Qwindow_configuration_p);
-
-  Qwindow_live_p = intern_c_string ("window-live-p");
-  staticpro (&Qwindow_live_p);
-
-  Qwindow_deletable_p = intern_c_string ("window-deletable-p");
-  staticpro (&Qwindow_deletable_p);
-
-  Qdelete_window = intern_c_string ("delete-window");
-  staticpro (&Qdelete_window);
-
-  Qresize_root_window = intern_c_string ("resize-root-window");
-  staticpro (&Qresize_root_window);
-
-  Qresize_root_window_vertically = intern_c_string ("resize-root-window-vertically");
-  staticpro (&Qresize_root_window_vertically);
-
-  Qsafe = intern_c_string ("safe");
-  staticpro (&Qsafe);
-
-  Qdisplay_buffer = intern_c_string ("display-buffer");
-  staticpro (&Qdisplay_buffer);
-
-  Qreplace_buffer_in_windows = intern_c_string ("replace-buffer-in-windows");
-  staticpro (&Qreplace_buffer_in_windows);
-
-  Qrecord_window_buffer = intern_c_string ("record-window-buffer");
-  staticpro (&Qrecord_window_buffer);
-
-  Qget_mru_window = intern_c_string ("get-mru-window");
-  staticpro (&Qget_mru_window);
-
-  Qtemp_buffer_show_hook = intern_c_string ("temp-buffer-show-hook");
-  staticpro (&Qtemp_buffer_show_hook);
-
-  Qabove = intern_c_string ("above");
-  staticpro (&Qabove);
-
-  Qbelow = intern_c_string ("below");
-  staticpro (&Qbelow);
-
-  Qauto_buffer_name = intern_c_string ("auto-buffer-name");
-  staticpro (&Qauto_buffer_name);
+  DEFSYM (Qwindow_configuration_change_hook, "window-configuration-change-hook");
+  DEFSYM (Qwindowp, "windowp");
+  DEFSYM (Qwindow_configuration_p, "window-configuration-p");
+  DEFSYM (Qwindow_live_p, "window-live-p");
+  DEFSYM (Qwindow_deletable_p, "window-deletable-p");
+  DEFSYM (Qdelete_window, "delete-window");
+  DEFSYM (Qwindow_resize_root_window, "window--resize-root-window");
+  DEFSYM (Qwindow_resize_root_window_vertically, "window--resize-root-window-vertically");
+  DEFSYM (Qsafe, "safe");
+  DEFSYM (Qdisplay_buffer, "display-buffer");
+  DEFSYM (Qreplace_buffer_in_windows, "replace-buffer-in-windows");
+  DEFSYM (Qrecord_window_buffer, "record-window-buffer");
+  DEFSYM (Qget_mru_window, "get-mru-window");
+  DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook");
+  DEFSYM (Qabove, "above");
+  DEFSYM (Qbelow, "below");
+  DEFSYM (Qauto_buffer_name, "auto-buffer-name");
 
   staticpro (&Vwindow_list);
 
@@ -6634,13 +6571,12 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Sset_frame_selected_window);
   defsubr (&Spos_visible_in_window_p);
   defsubr (&Swindow_line_height);
-  defsubr (&Swindow_clone_number);
   defsubr (&Swindow_buffer);
   defsubr (&Swindow_parent);
-  defsubr (&Swindow_vchild);
-  defsubr (&Swindow_hchild);
-  defsubr (&Swindow_next);
-  defsubr (&Swindow_prev);
+  defsubr (&Swindow_top_child);
+  defsubr (&Swindow_left_child);
+  defsubr (&Swindow_next_sibling);
+  defsubr (&Swindow_prev_sibling);
   defsubr (&Swindow_splits);
   defsubr (&Sset_window_splits);
   defsubr (&Swindow_nest);
@@ -6654,7 +6590,7 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Swindow_new_normal);
   defsubr (&Sset_window_new_total);
   defsubr (&Sset_window_new_normal);
-  defsubr (&Sresize_window_apply);
+  defsubr (&Swindow_resize_apply);
   defsubr (&Swindow_body_size);
   defsubr (&Swindow_hscroll);
   defsubr (&Sset_window_hscroll);
@@ -6684,7 +6620,6 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Sdelete_window_internal);
   defsubr (&Sresize_mini_window_internal);
   defsubr (&Sset_window_buffer);
-  defsubr (&Sset_window_clone_number);
   defsubr (&Srun_window_configuration_change_hook);
   defsubr (&Sselect_window);
   defsubr (&Sforce_window_update);
diff --git a/src/window.h b/src/window.h
index c3f59e4b116..485734e907e 100644
--- a/src/window.h
+++ b/src/window.h
@@ -165,10 +165,6 @@ struct window
     /* Unique number of window assigned when it was created.  */
     Lisp_Object sequence_number;
 
-    /* Sequence number of window this window was cloned from.  Identic
-       to sequence number if window was not cloned.  */
-    Lisp_Object clone_number;
-
     /* No permanent meaning; used by save-window-excursion's
        bookkeeping.  */
     Lisp_Object temslot;
diff --git a/src/xdisp.c b/src/xdisp.c
index f0b219702f6..a99f06a4e45 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26428,8 +26428,7 @@ syms_of_xdisp (void)
   Vmessage_stack = Qnil;
   staticpro (&Vmessage_stack);
 
-  Qinhibit_redisplay = intern_c_string ("inhibit-redisplay");
-  staticpro (&Qinhibit_redisplay);
+  DEFSYM (Qinhibit_redisplay, "inhibit-redisplay");
 
   message_dolog_marker1 = Fmake_marker ();
   staticpro (&message_dolog_marker1);
@@ -26454,141 +26453,72 @@ syms_of_xdisp (void)
   defsubr (&Sinvisible_p);
   defsubr (&Scurrent_bidi_paragraph_direction);
 
-  staticpro (&Qmenu_bar_update_hook);
-  Qmenu_bar_update_hook = intern_c_string ("menu-bar-update-hook");
-
-  staticpro (&Qoverriding_terminal_local_map);
-  Qoverriding_terminal_local_map = intern_c_string ("overriding-terminal-local-map");
-
-  staticpro (&Qoverriding_local_map);
-  Qoverriding_local_map = intern_c_string ("overriding-local-map");
-
-  staticpro (&Qwindow_scroll_functions);
-  Qwindow_scroll_functions = intern_c_string ("window-scroll-functions");
-
-  staticpro (&Qwindow_text_change_functions);
-  Qwindow_text_change_functions = intern_c_string ("window-text-change-functions");
-
-  staticpro (&Qredisplay_end_trigger_functions);
-  Qredisplay_end_trigger_functions = intern_c_string ("redisplay-end-trigger-functions");
-
-  staticpro (&Qinhibit_point_motion_hooks);
-  Qinhibit_point_motion_hooks = intern_c_string ("inhibit-point-motion-hooks");
-
-  Qeval = intern_c_string ("eval");
-  staticpro (&Qeval);
-
-  QCdata = intern_c_string (":data");
-  staticpro (&QCdata);
-  Qdisplay = intern_c_string ("display");
-  staticpro (&Qdisplay);
-  Qspace_width = intern_c_string ("space-width");
-  staticpro (&Qspace_width);
-  Qraise = intern_c_string ("raise");
-  staticpro (&Qraise);
-  Qslice = intern_c_string ("slice");
-  staticpro (&Qslice);
-  Qspace = intern_c_string ("space");
-  staticpro (&Qspace);
-  Qmargin = intern_c_string ("margin");
-  staticpro (&Qmargin);
-  Qpointer = intern_c_string ("pointer");
-  staticpro (&Qpointer);
-  Qleft_margin = intern_c_string ("left-margin");
-  staticpro (&Qleft_margin);
-  Qright_margin = intern_c_string ("right-margin");
-  staticpro (&Qright_margin);
-  Qcenter = intern_c_string ("center");
-  staticpro (&Qcenter);
-  Qline_height = intern_c_string ("line-height");
-  staticpro (&Qline_height);
-  QCalign_to = intern_c_string (":align-to");
-  staticpro (&QCalign_to);
-  QCrelative_width = intern_c_string (":relative-width");
-  staticpro (&QCrelative_width);
-  QCrelative_height = intern_c_string (":relative-height");
-  staticpro (&QCrelative_height);
-  QCeval = intern_c_string (":eval");
-  staticpro (&QCeval);
-  QCpropertize = intern_c_string (":propertize");
-  staticpro (&QCpropertize);
-  QCfile = intern_c_string (":file");
-  staticpro (&QCfile);
-  Qfontified = intern_c_string ("fontified");
-  staticpro (&Qfontified);
-  Qfontification_functions = intern_c_string ("fontification-functions");
-  staticpro (&Qfontification_functions);
-  Qtrailing_whitespace = intern_c_string ("trailing-whitespace");
-  staticpro (&Qtrailing_whitespace);
-  Qescape_glyph = intern_c_string ("escape-glyph");
-  staticpro (&Qescape_glyph);
-  Qnobreak_space = intern_c_string ("nobreak-space");
-  staticpro (&Qnobreak_space);
-  Qimage = intern_c_string ("image");
-  staticpro (&Qimage);
-  Qtext = intern_c_string ("text");
-  staticpro (&Qtext);
-  Qboth = intern_c_string ("both");
-  staticpro (&Qboth);
-  Qboth_horiz = intern_c_string ("both-horiz");
-  staticpro (&Qboth_horiz);
-  Qtext_image_horiz = intern_c_string ("text-image-horiz");
-  staticpro (&Qtext_image_horiz);
-  QCmap = intern_c_string (":map");
-  staticpro (&QCmap);
-  QCpointer = intern_c_string (":pointer");
-  staticpro (&QCpointer);
-  Qrect = intern_c_string ("rect");
-  staticpro (&Qrect);
-  Qcircle = intern_c_string ("circle");
-  staticpro (&Qcircle);
-  Qpoly = intern_c_string ("poly");
-  staticpro (&Qpoly);
-  Qmessage_truncate_lines = intern_c_string ("message-truncate-lines");
-  staticpro (&Qmessage_truncate_lines);
-  Qgrow_only = intern_c_string ("grow-only");
-  staticpro (&Qgrow_only);
-  Qinhibit_menubar_update = intern_c_string ("inhibit-menubar-update");
-  staticpro (&Qinhibit_menubar_update);
-  Qinhibit_eval_during_redisplay = intern_c_string ("inhibit-eval-during-redisplay");
-  staticpro (&Qinhibit_eval_during_redisplay);
-  Qposition = intern_c_string ("position");
-  staticpro (&Qposition);
-  Qbuffer_position = intern_c_string ("buffer-position");
-  staticpro (&Qbuffer_position);
-  Qobject = intern_c_string ("object");
-  staticpro (&Qobject);
-  Qbar = intern_c_string ("bar");
-  staticpro (&Qbar);
-  Qhbar = intern_c_string ("hbar");
-  staticpro (&Qhbar);
-  Qbox = intern_c_string ("box");
-  staticpro (&Qbox);
-  Qhollow = intern_c_string ("hollow");
-  staticpro (&Qhollow);
-  Qhand = intern_c_string ("hand");
-  staticpro (&Qhand);
-  Qarrow = intern_c_string ("arrow");
-  staticpro (&Qarrow);
-  Qtext = intern_c_string ("text");
-  staticpro (&Qtext);
-  Qinhibit_free_realized_faces = intern_c_string ("inhibit-free-realized-faces");
-  staticpro (&Qinhibit_free_realized_faces);
+  DEFSYM (Qmenu_bar_update_hook, "menu-bar-update-hook");
+  DEFSYM (Qoverriding_terminal_local_map, "overriding-terminal-local-map");
+  DEFSYM (Qoverriding_local_map, "overriding-local-map");
+  DEFSYM (Qwindow_scroll_functions, "window-scroll-functions");
+  DEFSYM (Qwindow_text_change_functions, "window-text-change-functions");
+  DEFSYM (Qredisplay_end_trigger_functions, "redisplay-end-trigger-functions");
+  DEFSYM (Qinhibit_point_motion_hooks, "inhibit-point-motion-hooks");
+  DEFSYM (Qeval, "eval");
+  DEFSYM (QCdata, ":data");
+  DEFSYM (Qdisplay, "display");
+  DEFSYM (Qspace_width, "space-width");
+  DEFSYM (Qraise, "raise");
+  DEFSYM (Qslice, "slice");
+  DEFSYM (Qspace, "space");
+  DEFSYM (Qmargin, "margin");
+  DEFSYM (Qpointer, "pointer");
+  DEFSYM (Qleft_margin, "left-margin");
+  DEFSYM (Qright_margin, "right-margin");
+  DEFSYM (Qcenter, "center");
+  DEFSYM (Qline_height, "line-height");
+  DEFSYM (QCalign_to, ":align-to");
+  DEFSYM (QCrelative_width, ":relative-width");
+  DEFSYM (QCrelative_height, ":relative-height");
+  DEFSYM (QCeval, ":eval");
+  DEFSYM (QCpropertize, ":propertize");
+  DEFSYM (QCfile, ":file");
+  DEFSYM (Qfontified, "fontified");
+  DEFSYM (Qfontification_functions, "fontification-functions");
+  DEFSYM (Qtrailing_whitespace, "trailing-whitespace");
+  DEFSYM (Qescape_glyph, "escape-glyph");
+  DEFSYM (Qnobreak_space, "nobreak-space");
+  DEFSYM (Qimage, "image");
+  DEFSYM (Qtext, "text");
+  DEFSYM (Qboth, "both");
+  DEFSYM (Qboth_horiz, "both-horiz");
+  DEFSYM (Qtext_image_horiz, "text-image-horiz");
+  DEFSYM (QCmap, ":map");
+  DEFSYM (QCpointer, ":pointer");
+  DEFSYM (Qrect, "rect");
+  DEFSYM (Qcircle, "circle");
+  DEFSYM (Qpoly, "poly");
+  DEFSYM (Qmessage_truncate_lines, "message-truncate-lines");
+  DEFSYM (Qgrow_only, "grow-only");
+  DEFSYM (Qinhibit_menubar_update, "inhibit-menubar-update");
+  DEFSYM (Qinhibit_eval_during_redisplay, "inhibit-eval-during-redisplay");
+  DEFSYM (Qposition, "position");
+  DEFSYM (Qbuffer_position, "buffer-position");
+  DEFSYM (Qobject, "object");
+  DEFSYM (Qbar, "bar");
+  DEFSYM (Qhbar, "hbar");
+  DEFSYM (Qbox, "box");
+  DEFSYM (Qhollow, "hollow");
+  DEFSYM (Qhand, "hand");
+  DEFSYM (Qarrow, "arrow");
+  DEFSYM (Qtext, "text");
+  DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces");
 
   list_of_error = Fcons (Fcons (intern_c_string ("error"),
                                 Fcons (intern_c_string ("void-variable"), Qnil)),
                          Qnil);
   staticpro (&list_of_error);
 
-  Qlast_arrow_position = intern_c_string ("last-arrow-position");
-  staticpro (&Qlast_arrow_position);
-  Qlast_arrow_string = intern_c_string ("last-arrow-string");
-  staticpro (&Qlast_arrow_string);
-
-  Qoverlay_arrow_string = intern_c_string ("overlay-arrow-string");
-  staticpro (&Qoverlay_arrow_string);
-  Qoverlay_arrow_bitmap = intern_c_string ("overlay-arrow-bitmap");
-  staticpro (&Qoverlay_arrow_bitmap);
+  DEFSYM (Qlast_arrow_position, "last-arrow-position");
+  DEFSYM (Qlast_arrow_string, "last-arrow-string");
+  DEFSYM (Qoverlay_arrow_string, "overlay-arrow-string");
+  DEFSYM (Qoverlay_arrow_bitmap, "overlay-arrow-bitmap");
 
   echo_buffer[0] = echo_buffer[1] = Qnil;
   staticpro (&echo_buffer[0]);
@@ -26622,10 +26552,8 @@ syms_of_xdisp (void)
   staticpro (&previous_help_echo_string);
   help_echo_pos = -1;
 
-  Qright_to_left = intern_c_string ("right-to-left");
-  staticpro (&Qright_to_left);
-  Qleft_to_right = intern_c_string ("left-to-right");
-  staticpro (&Qleft_to_right);
+  DEFSYM (Qright_to_left, "right-to-left");
+  DEFSYM (Qleft_to_right, "left-to-right");
 
 #ifdef HAVE_WINDOW_SYSTEM
   DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p,
@@ -26945,8 +26873,7 @@ the frame's other specifications determine how to blink the cursor off.  */);
 If non-nil, windows are automatically scrolled horizontally to make
 point visible.  */);
   automatic_hscrolling_p = 1;
-  Qauto_hscroll_mode = intern_c_string ("auto-hscroll-mode");
-  staticpro (&Qauto_hscroll_mode);
+  DEFSYM (Qauto_hscroll_mode, "auto-hscroll-mode");
 
   DEFVAR_INT ("hscroll-margin", hscroll_margin,
     doc: /* *How many columns away from the window edge point is allowed to get
@@ -27002,8 +26929,7 @@ property.
 
 To add a prefix to non-continuation lines, use `line-prefix'.  */);
   Vwrap_prefix = Qnil;
-  staticpro (&Qwrap_prefix);
-  Qwrap_prefix = intern_c_string ("wrap-prefix");
+  DEFSYM (Qwrap_prefix, "wrap-prefix");
   Fmake_variable_buffer_local (Qwrap_prefix);
 
   DEFVAR_LISP ("line-prefix", Vline_prefix,
@@ -27016,8 +26942,7 @@ property.
 
 To add a prefix to continuation lines, use `wrap-prefix'.  */);
   Vline_prefix = Qnil;
-  staticpro (&Qline_prefix);
-  Qline_prefix = intern_c_string ("line-prefix");
+  DEFSYM (Qline_prefix, "line-prefix");
   Fmake_variable_buffer_local (Qline_prefix);
 
   DEFVAR_BOOL ("inhibit-eval-during-redisplay", inhibit_eval_during_redisplay,
diff --git a/src/xfaces.c b/src/xfaces.c
index 5833633c2e7..91f4b133466 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3813,6 +3813,18 @@ Default face attributes override any local face attributes.  */)
               Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, name),
                                                       Qnil));
             }
+
+          if (STRINGP (gvec[LFACE_FOREGROUND_INDEX]))
+            Fmodify_frame_parameters (frame,
+                                      Fcons (Fcons (Qforeground_color,
+                                                    gvec[LFACE_FOREGROUND_INDEX]),
+                                             Qnil));
+
+          if (STRINGP (gvec[LFACE_BACKGROUND_INDEX]))
+            Fmodify_frame_parameters (frame,
+                                      Fcons (Fcons (Qbackground_color,
+                                                    gvec[LFACE_BACKGROUND_INDEX]),
+                                             Qnil));
         }
     }
 
@@ -6393,153 +6405,82 @@ DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources,
 void
 syms_of_xfaces (void)
 {
-  Qface = intern_c_string ("face");
-  staticpro (&Qface);
-  Qface_no_inherit = intern_c_string ("face-no-inherit");
-  staticpro (&Qface_no_inherit);
-  Qbitmap_spec_p = intern_c_string ("bitmap-spec-p");
-  staticpro (&Qbitmap_spec_p);
-  Qframe_set_background_mode = intern_c_string ("frame-set-background-mode");
-  staticpro (&Qframe_set_background_mode);
+  DEFSYM (Qface, "face");
+  DEFSYM (Qface_no_inherit, "face-no-inherit");
+  DEFSYM (Qbitmap_spec_p, "bitmap-spec-p");
+  DEFSYM (Qframe_set_background_mode, "frame-set-background-mode");
 
   /* Lisp face attribute keywords.  */
-  QCfamily = intern_c_string (":family");
-  staticpro (&QCfamily);
-  QCheight = intern_c_string (":height");
-  staticpro (&QCheight);
-  QCweight = intern_c_string (":weight");
-  staticpro (&QCweight);
-  QCslant = intern_c_string (":slant");
-  staticpro (&QCslant);
-  QCunderline = intern_c_string (":underline");
-  staticpro (&QCunderline);
-  QCinverse_video = intern_c_string (":inverse-video");
-  staticpro (&QCinverse_video);
-  QCreverse_video = intern_c_string (":reverse-video");
-  staticpro (&QCreverse_video);
-  QCforeground = intern_c_string (":foreground");
-  staticpro (&QCforeground);
-  QCbackground = intern_c_string (":background");
-  staticpro (&QCbackground);
-  QCstipple = intern_c_string (":stipple");
-  staticpro (&QCstipple);
-  QCwidth = intern_c_string (":width");
-  staticpro (&QCwidth);
-  QCfont = intern_c_string (":font");
-  staticpro (&QCfont);
-  QCfontset = intern_c_string (":fontset");
-  staticpro (&QCfontset);
-  QCbold = intern_c_string (":bold");
-  staticpro (&QCbold);
-  QCitalic = intern_c_string (":italic");
-  staticpro (&QCitalic);
-  QCoverline = intern_c_string (":overline");
-  staticpro (&QCoverline);
-  QCstrike_through = intern_c_string (":strike-through");
-  staticpro (&QCstrike_through);
-  QCbox = intern_c_string (":box");
-  staticpro (&QCbox);
-  QCinherit = intern_c_string (":inherit");
-  staticpro (&QCinherit);
+  DEFSYM (QCfamily, ":family");
+  DEFSYM (QCheight, ":height");
+  DEFSYM (QCweight, ":weight");
+  DEFSYM (QCslant, ":slant");
+  DEFSYM (QCunderline, ":underline");
+  DEFSYM (QCinverse_video, ":inverse-video");
+  DEFSYM (QCreverse_video, ":reverse-video");
+  DEFSYM (QCforeground, ":foreground");
+  DEFSYM (QCbackground, ":background");
+  DEFSYM (QCstipple, ":stipple");
+  DEFSYM (QCwidth, ":width");
+  DEFSYM (QCfont, ":font");
+  DEFSYM (QCfontset, ":fontset");
+  DEFSYM (QCbold, ":bold");
+  DEFSYM (QCitalic, ":italic");
+  DEFSYM (QCoverline, ":overline");
+  DEFSYM (QCstrike_through, ":strike-through");
+  DEFSYM (QCbox, ":box");
+  DEFSYM (QCinherit, ":inherit");
 
   /* Symbols used for Lisp face attribute values.  */
-  QCcolor = intern_c_string (":color");
-  staticpro (&QCcolor);
-  QCline_width = intern_c_string (":line-width");
-  staticpro (&QCline_width);
-  QCstyle = intern_c_string (":style");
-  staticpro (&QCstyle);
-  Qreleased_button = intern_c_string ("released-button");
-  staticpro (&Qreleased_button);
-  Qpressed_button = intern_c_string ("pressed-button");
-  staticpro (&Qpressed_button);
-  Qnormal = intern_c_string ("normal");
-  staticpro (&Qnormal);
-  Qultra_light = intern_c_string ("ultra-light");
-  staticpro (&Qultra_light);
-  Qextra_light = intern_c_string ("extra-light");
-  staticpro (&Qextra_light);
-  Qlight = intern_c_string ("light");
-  staticpro (&Qlight);
-  Qsemi_light = intern_c_string ("semi-light");
-  staticpro (&Qsemi_light);
-  Qsemi_bold = intern_c_string ("semi-bold");
-  staticpro (&Qsemi_bold);
-  Qbold = intern_c_string ("bold");
-  staticpro (&Qbold);
-  Qextra_bold = intern_c_string ("extra-bold");
-  staticpro (&Qextra_bold);
-  Qultra_bold = intern_c_string ("ultra-bold");
-  staticpro (&Qultra_bold);
-  Qoblique = intern_c_string ("oblique");
-  staticpro (&Qoblique);
-  Qitalic = intern_c_string ("italic");
-  staticpro (&Qitalic);
-  Qreverse_oblique = intern_c_string ("reverse-oblique");
-  staticpro (&Qreverse_oblique);
-  Qreverse_italic = intern_c_string ("reverse-italic");
-  staticpro (&Qreverse_italic);
-  Qultra_condensed = intern_c_string ("ultra-condensed");
-  staticpro (&Qultra_condensed);
-  Qextra_condensed = intern_c_string ("extra-condensed");
-  staticpro (&Qextra_condensed);
-  Qcondensed = intern_c_string ("condensed");
-  staticpro (&Qcondensed);
-  Qsemi_condensed = intern_c_string ("semi-condensed");
-  staticpro (&Qsemi_condensed);
-  Qsemi_expanded = intern_c_string ("semi-expanded");
-  staticpro (&Qsemi_expanded);
-  Qexpanded = intern_c_string ("expanded");
-  staticpro (&Qexpanded);
-  Qextra_expanded = intern_c_string ("extra-expanded");
-  staticpro (&Qextra_expanded);
-  Qultra_expanded = intern_c_string ("ultra-expanded");
-  staticpro (&Qultra_expanded);
-  Qbackground_color = intern_c_string ("background-color");
-  staticpro (&Qbackground_color);
-  Qforeground_color = intern_c_string ("foreground-color");
-  staticpro (&Qforeground_color);
-  Qunspecified = intern_c_string ("unspecified");
-  staticpro (&Qunspecified);
-  Qignore_defface = intern_c_string (":ignore-defface");
-  staticpro (&Qignore_defface);
-
-  Qface_alias = intern_c_string ("face-alias");
-  staticpro (&Qface_alias);
-  Qdefault = intern_c_string ("default");
-  staticpro (&Qdefault);
-  Qtool_bar = intern_c_string ("tool-bar");
-  staticpro (&Qtool_bar);
-  Qregion = intern_c_string ("region");
-  staticpro (&Qregion);
-  Qfringe = intern_c_string ("fringe");
-  staticpro (&Qfringe);
-  Qheader_line = intern_c_string ("header-line");
-  staticpro (&Qheader_line);
-  Qscroll_bar = intern_c_string ("scroll-bar");
-  staticpro (&Qscroll_bar);
-  Qmenu = intern_c_string ("menu");
-  staticpro (&Qmenu);
-  Qcursor = intern_c_string ("cursor");
-  staticpro (&Qcursor);
-  Qborder = intern_c_string ("border");
-  staticpro (&Qborder);
-  Qmouse = intern_c_string ("mouse");
-  staticpro (&Qmouse);
-  Qmode_line_inactive = intern_c_string ("mode-line-inactive");
-  staticpro (&Qmode_line_inactive);
-  Qvertical_border = intern_c_string ("vertical-border");
-  staticpro (&Qvertical_border);
-  Qtty_color_desc = intern_c_string ("tty-color-desc");
-  staticpro (&Qtty_color_desc);
-  Qtty_color_standard_values = intern_c_string ("tty-color-standard-values");
-  staticpro (&Qtty_color_standard_values);
-  Qtty_color_by_index = intern_c_string ("tty-color-by-index");
-  staticpro (&Qtty_color_by_index);
-  Qtty_color_alist = intern_c_string ("tty-color-alist");
-  staticpro (&Qtty_color_alist);
-  Qscalable_fonts_allowed = intern_c_string ("scalable-fonts-allowed");
-  staticpro (&Qscalable_fonts_allowed);
+  DEFSYM (QCcolor, ":color");
+  DEFSYM (QCline_width, ":line-width");
+  DEFSYM (QCstyle, ":style");
+  DEFSYM (Qreleased_button, "released-button");
+  DEFSYM (Qpressed_button, "pressed-button");
+  DEFSYM (Qnormal, "normal");
+  DEFSYM (Qultra_light, "ultra-light");
+  DEFSYM (Qextra_light, "extra-light");
+  DEFSYM (Qlight, "light");
+  DEFSYM (Qsemi_light, "semi-light");
+  DEFSYM (Qsemi_bold, "semi-bold");
+  DEFSYM (Qbold, "bold");
+  DEFSYM (Qextra_bold, "extra-bold");
+  DEFSYM (Qultra_bold, "ultra-bold");
+  DEFSYM (Qoblique, "oblique");
+  DEFSYM (Qitalic, "italic");
+  DEFSYM (Qreverse_oblique, "reverse-oblique");
+  DEFSYM (Qreverse_italic, "reverse-italic");
+  DEFSYM (Qultra_condensed, "ultra-condensed");
+  DEFSYM (Qextra_condensed, "extra-condensed");
+  DEFSYM (Qcondensed, "condensed");
+  DEFSYM (Qsemi_condensed, "semi-condensed");
+  DEFSYM (Qsemi_expanded, "semi-expanded");
+  DEFSYM (Qexpanded, "expanded");
+  DEFSYM (Qextra_expanded, "extra-expanded");
+  DEFSYM (Qultra_expanded, "ultra-expanded");
+  DEFSYM (Qbackground_color, "background-color");
+  DEFSYM (Qforeground_color, "foreground-color");
+  DEFSYM (Qunspecified, "unspecified");
+  DEFSYM (Qignore_defface, ":ignore-defface");
+
+  DEFSYM (Qface_alias, "face-alias");
+  DEFSYM (Qdefault, "default");
+  DEFSYM (Qtool_bar, "tool-bar");
+  DEFSYM (Qregion, "region");
+  DEFSYM (Qfringe, "fringe");
+  DEFSYM (Qheader_line, "header-line");
+  DEFSYM (Qscroll_bar, "scroll-bar");
+  DEFSYM (Qmenu, "menu");
+  DEFSYM (Qcursor, "cursor");
+  DEFSYM (Qborder, "border");
+  DEFSYM (Qmouse, "mouse");
+  DEFSYM (Qmode_line_inactive, "mode-line-inactive");
+  DEFSYM (Qvertical_border, "vertical-border");
+  DEFSYM (Qtty_color_desc, "tty-color-desc");
+  DEFSYM (Qtty_color_standard_values, "tty-color-standard-values");
+  DEFSYM (Qtty_color_by_index, "tty-color-by-index");
+  DEFSYM (Qtty_color_alist, "tty-color-alist");
+  DEFSYM (Qscalable_fonts_allowed, "scalable-fonts-allowed");
 
   Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil);
   staticpro (&Vparam_value_alist);
diff --git a/src/xfns.c b/src/xfns.c
index 2b2ecf93739..c70f4bb9a82 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5797,25 +5797,14 @@ syms_of_xfns (void)
   /* The section below is built by the lisp expression at the top of the file,
      just above where these variables are declared.  */
   /*&&& init symbols here &&&*/
-  Qnone = intern_c_string ("none");
-  staticpro (&Qnone);
-  Qsuppress_icon = intern_c_string ("suppress-icon");
-  staticpro (&Qsuppress_icon);
-  Qundefined_color = intern_c_string ("undefined-color");
-  staticpro (&Qundefined_color);
-  Qcompound_text = intern_c_string ("compound-text");
-  staticpro (&Qcompound_text);
-  Qcancel_timer = intern_c_string ("cancel-timer");
-  staticpro (&Qcancel_timer);
-  Qfont_param = intern_c_string ("font-parameter");
-  staticpro (&Qfont_param);
+  DEFSYM (Qnone, "none");
+  DEFSYM (Qsuppress_icon, "suppress-icon");
+  DEFSYM (Qundefined_color, "undefined-color");
+  DEFSYM (Qcompound_text, "compound-text");
+  DEFSYM (Qcancel_timer, "cancel-timer");
+  DEFSYM (Qfont_param, "font-parameter");
   /* This is the end of symbol initialization.  */
 
-  /* Text property `display' should be nonsticky by default.  */
-  Vtext_property_default_nonsticky
-    = Fcons (Fcons (Qdisplay, Qt), Vtext_property_default_nonsticky);
-
-
   Fput (Qundefined_color, Qerror_conditions,
         pure_cons (Qundefined_color, pure_cons (Qerror, Qnil)));
   Fput (Qundefined_color, Qerror_message,
diff --git a/src/xgselect.c b/src/xgselect.c
index 0d154f6496a..9ccdd37489f 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -15,14 +15,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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/>.  */
+along with GNU Emacs.  If not, see <http§://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 #include <setjmp.h>
 #include "xgselect.h"
 
-#if defined (USE_GTK) || defined (HAVE_GCONF)
+#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
 
 #include <glib.h>
 #include <errno.h>
@@ -149,13 +149,13 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
 
   return retval;
 }
-#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
+#endif /* USE_GTK || HAVE_GCONF || HAVE_GSETTINGS */
 
 void
 xgselect_initialize (void)
 {
-#if defined (USE_GTK) || defined (HAVE_GCONF)
+#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
   gfds_size = 128;
   gfds = xmalloc (sizeof (*gfds)*gfds_size);
-#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
+#endif
 }
diff --git a/src/xmenu.c b/src/xmenu.c
index 1cb71187c0c..fc629b35104 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2559,8 +2559,7 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
 void
 syms_of_xmenu (void)
 {
-  Qdebug_on_next_call = intern_c_string ("debug-on-next-call");
-  staticpro (&Qdebug_on_next_call);
+  DEFSYM (Qdebug_on_next_call, "debug-on-next-call");
 
 #ifdef USE_X_TOOLKIT
   widget_id_tick = (1<<16);
diff --git a/src/xsettings.c b/src/xsettings.c
index e2575650df9..06718df5a3c 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -34,9 +34,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <X11/Xproto.h>
 
+#ifdef HAVE_GSETTINGS
+#include <glib-object.h>
+#include <gio/gio.h>
+#endif
+
 #ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
 #endif
+
 #ifdef HAVE_XFT
 #include <X11/Xft/Xft.h>
 #endif
@@ -48,10 +54,7 @@ static Lisp_Object Qmonospace_font_name, Qfont_name, Qfont_render,
   Qtool_bar_style;
 static Lisp_Object current_tool_bar_style;
 
-#ifdef HAVE_GCONF
-static GConfClient *gconf_client;
-#endif
-
+/* Store an config changed event in to the event queue.  */
 
 static void
 store_config_changed_event (Lisp_Object arg, Lisp_Object display_name)
@@ -64,6 +67,97 @@ store_config_changed_event (Lisp_Object arg, Lisp_Object display_name)
   kbd_buffer_store_event (&event);
 }
 
+/* Return non-zero if DPYINFO is still valid.  */
+static int
+dpyinfo_valid (struct x_display_info *dpyinfo)
+{
+  int found = 0;
+  if (dpyinfo != NULL)
+    {
+      struct x_display_info *d;
+      for (d = x_display_list; !found && d; d = d->next)
+        found = d == dpyinfo && d->display == dpyinfo->display;
+    }
+  return found;
+}
+
+/* Store a monospace font change event if the monospaced font changed.  */
+
+#ifdef HAVE_XFT
+static void
+store_monospaced_changed (const char *newfont)
+{
+  if (current_mono_font != NULL && strcmp (newfont, current_mono_font) == 0)
+    return; /* No change. */
+
+  xfree (current_mono_font);
+  current_mono_font = xstrdup (newfont);
+
+  if (dpyinfo_valid (first_dpyinfo) && use_system_font)
+    {
+      store_config_changed_event (Qmonospace_font_name,
+                                  XCAR (first_dpyinfo->name_list_element));
+    }
+}
+
+/* Store a font name change event if the font name changed.  */
+
+static void
+store_font_name_changed (const char *newfont)
+{
+  if (current_font != NULL && strcmp (newfont, current_font) == 0)
+    return; /* No change. */
+
+  xfree (current_font);
+  current_font = xstrdup (newfont);
+
+  if (dpyinfo_valid (first_dpyinfo))
+    {
+      store_config_changed_event (Qfont_name,
+                                  XCAR (first_dpyinfo->name_list_element));
+    }
+}
+#endif /* HAVE_XFT */
+
+/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value.
+   Return Qnil if TOOL_BAR_STYLE is not known.  */
+
+static Lisp_Object
+map_tool_bar_style (const char *tool_bar_style)
+{
+  Lisp_Object style = Qnil;
+  if (tool_bar_style)
+    {
+      if (strcmp (tool_bar_style, "both") == 0)
+        style = Qboth;
+      else if (strcmp (tool_bar_style, "both-horiz") == 0)
+        style = Qboth_horiz;
+      else if (strcmp (tool_bar_style, "icons") == 0)
+        style = Qimage;
+      else if (strcmp (tool_bar_style, "text") == 0)
+        style = Qtext;
+    }
+
+  return style;
+}
+
+/* Store a tool bar style change event if the tool bar style changed.  */
+
+static void
+store_tool_bar_style_changed (const char *newstyle,
+                              struct x_display_info *dpyinfo)
+{
+  Lisp_Object style = map_tool_bar_style (newstyle);
+  if (EQ (current_tool_bar_style, style))
+    return; /* No change. */
+
+  current_tool_bar_style = style;
+  if (dpyinfo_valid (dpyinfo))
+    store_config_changed_event (Qtool_bar_style,
+                                XCAR (dpyinfo->name_list_element));
+}
+
+
 #define XSETTINGS_FONT_NAME       "Gtk/FontName"
 #define XSETTINGS_TOOL_BAR_STYLE  "Gtk/ToolbarStyle"
 
@@ -83,55 +177,128 @@ struct xsettings
   FcBool aa, hinting;
   int rgba, lcdfilter, hintstyle;
   double dpi;
-#endif
 
   char *font;
+#endif
+
   char *tb_style;
 
   unsigned seen;
 };
 
+#ifdef HAVE_GSETTINGS
+#define GSETTINGS_SCHEMA         "org.gnome.desktop.interface"
+#define GSETTINGS_TOOL_BAR_STYLE "toolbar-style"
+
+#ifdef HAVE_XFT
+#define GSETTINGS_MONO_FONT  "monospace-font-name"
+#define GSETTINGS_FONT_NAME  "font-name"
+#endif
+
+
+/* The single GSettings instance, or NULL if not connected to GSettings.  */
+
+static GSettings *gsettings_client;
+
+/* Callback called when something changed in GSettings.  */
+
+static void
+something_changed_gsettingsCB (GSettings *settings,
+                               gchar *key,
+                               gpointer user_data)
+{
+  GVariant *val;
+
+  if (strcmp (key, GSETTINGS_TOOL_BAR_STYLE) == 0)
+    {
+      val = g_settings_get_value (settings, GSETTINGS_TOOL_BAR_STYLE);
+      if (val)
+        {
+          g_variant_ref_sink (val);
+          if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+            {
+              const gchar *newstyle = g_variant_get_string (val, NULL);
+              store_tool_bar_style_changed (newstyle, first_dpyinfo);
+            }
+          g_variant_unref (val);
+        }
+    }
+#ifdef HAVE_XFT
+  else if (strcmp (key, GSETTINGS_MONO_FONT) == 0)
+    {
+      val = g_settings_get_value (settings, GSETTINGS_MONO_FONT);
+      if (val)
+        {
+          g_variant_ref_sink (val);
+          if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+            {
+              const gchar *newfont = g_variant_get_string (val, NULL);
+              store_monospaced_changed (newfont);
+            }
+          g_variant_unref (val);
+        }
+    }
+  else if (strcmp (key, GSETTINGS_FONT_NAME) == 0)
+    {
+      val = g_settings_get_value (settings, GSETTINGS_FONT_NAME);
+      if (val)
+        {
+          g_variant_ref_sink (val);
+          if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+            {
+              const gchar *newfont = g_variant_get_string (val, NULL);
+              store_font_name_changed (newfont);
+            }
+          g_variant_unref (val);
+        }
+    }
+#endif /* HAVE_XFT */  
+}
+
+#endif /* HAVE_GSETTINGS */
+
 #ifdef HAVE_GCONF
+#define GCONF_TOOL_BAR_STYLE "/desktop/gnome/interface/toolbar_style"
+#ifdef HAVE_XFT
+#define GCONF_MONO_FONT  "/desktop/gnome/interface/monospace_font_name"
+#define GCONF_FONT_NAME  "/desktop/gnome/interface/font_name"
+#endif
 
-#define SYSTEM_MONO_FONT     "/desktop/gnome/interface/monospace_font_name"
-#define SYSTEM_FONT          "/desktop/gnome/interface/font_name"
+/* The single GConf instance, or NULL if not connected to GConf.  */
 
-/* Callback called when something changed in GConf that we care about,
-   that is SYSTEM_MONO_FONT.  */
+static GConfClient *gconf_client;
+
+/* Callback called when something changed in GConf that we care about.  */
 
 static void
-something_changedCB (GConfClient *client,
-                     guint cnxn_id,
-                     GConfEntry *entry,
-                     gpointer user_data)
+something_changed_gconfCB (GConfClient *client,
+                           guint cnxn_id,
+                           GConfEntry *entry,
+                           gpointer user_data)
 {
   GConfValue *v = gconf_entry_get_value (entry);
+  const char *key = gconf_entry_get_key (entry);
 
-  if (!v) return;
-  if (v->type == GCONF_VALUE_STRING)
+  if (!v || v->type != GCONF_VALUE_STRING || ! key) return;
+  if (strcmp (key, GCONF_TOOL_BAR_STYLE) == 0)
     {
       const char *value = gconf_value_get_string (v);
-      if (current_mono_font != NULL && strcmp (value, current_mono_font) == 0)
-        return; /* No change. */
-
-      xfree (current_mono_font);
-      current_mono_font = xstrdup (value);
+      store_tool_bar_style_changed (value, first_dpyinfo);
     }
-
-
-  if (first_dpyinfo != NULL)
+#ifdef HAVE_XFT
+  else if (strcmp (key, GCONF_MONO_FONT) == 0)
+    {
+      const char *value = gconf_value_get_string (v);
+      store_monospaced_changed (value);
+    }
+  else if (strcmp (key, GCONF_FONT_NAME) == 0)
     {
-      /* Check if display still open */
-      struct x_display_info *dpyinfo;
-      int found = 0;
-      for (dpyinfo = x_display_list; !found && dpyinfo; dpyinfo = dpyinfo->next)
-        found = dpyinfo == first_dpyinfo;
-
-      if (found && use_system_font)
-        store_config_changed_event (Qmonospace_font_name,
-                                    XCAR (first_dpyinfo->name_list_element));
+      const char *value = gconf_value_get_string (v);
+      store_font_name_changed (value);
     }
+#endif /* HAVE_XFT */
 }
+
 #endif /* HAVE_GCONF */
 
 #ifdef HAVE_XFT
@@ -274,14 +441,14 @@ parse_settings (unsigned char *prop,
       bytes_parsed += 4; /* Skip serial for this value */
       if (bytes_parsed > bytes) return BadLength;
 
-      want_this =
+      want_this = 
 #ifdef HAVE_XFT
         (nlen > 6 && strncmp (name, "Xft/", 4) == 0)
+        || strcmp (XSETTINGS_FONT_NAME, name) == 0
         ||
 #endif
-        (strcmp (XSETTINGS_FONT_NAME, name) == 0)
-        || (strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0);
-
+        strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0;
+  
       switch (type)
         {
         case 0: /* Integer */
@@ -322,17 +489,17 @@ parse_settings (unsigned char *prop,
       if (want_this)
         {
           ++settings_seen;
-          if (strcmp (name, XSETTINGS_FONT_NAME) == 0)
-            {
-              settings->font = xstrdup (sval);
-              settings->seen |= SEEN_FONT;
-            }
-          else if (strcmp (name, XSETTINGS_TOOL_BAR_STYLE) == 0)
+          if (strcmp (name, XSETTINGS_TOOL_BAR_STYLE) == 0)
             {
               settings->tb_style = xstrdup (sval);
               settings->seen |= SEEN_TB_STYLE;
             }
 #ifdef HAVE_XFT
+          else if (strcmp (name, XSETTINGS_FONT_NAME) == 0)
+            {
+              settings->font = xstrdup (sval);
+              settings->seen |= SEEN_FONT;
+            }
           else if (strcmp (name, "Xft/Antialias") == 0)
             {
               settings->seen |= SEEN_AA;
@@ -397,6 +564,10 @@ parse_settings (unsigned char *prop,
   return settings_seen;
 }
 
+/* Read settings from the XSettings property window on display for DPYINFO.
+   Store settings read in SETTINGS.
+   Return non-zero if successful, zero if not.  */
+
 static int
 read_settings (struct x_display_info *dpyinfo, struct xsettings *settings)
 {
@@ -426,6 +597,8 @@ read_settings (struct x_display_info *dpyinfo, struct xsettings *settings)
   return rc != 0;
 }
 
+/* Apply Xft settings in SETTINGS to the Xft library.
+   If SEND_EVENT_P is non-zero store a Lisp event that Xft settings changed.  */
 
 static void
 apply_xft_settings (struct x_display_info *dpyinfo,
@@ -444,9 +617,9 @@ apply_xft_settings (struct x_display_info *dpyinfo,
                         pat);
   FcPatternGetBool (pat, FC_ANTIALIAS, 0, &oldsettings.aa);
   FcPatternGetBool (pat, FC_HINTING, 0, &oldsettings.hinting);
-# ifdef FC_HINT_STYLE
+#ifdef FC_HINT_STYLE
   FcPatternGetInteger (pat, FC_HINT_STYLE, 0, &oldsettings.hintstyle);
-# endif
+#endif
   FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter);
   FcPatternGetInteger (pat, FC_RGBA, 0, &oldsettings.rgba);
   FcPatternGetDouble (pat, FC_DPI, 0, &oldsettings.dpi);
@@ -485,7 +658,7 @@ apply_xft_settings (struct x_display_info *dpyinfo,
       oldsettings.lcdfilter = settings->lcdfilter;
     }
 
-# ifdef FC_HINT_STYLE
+#ifdef FC_HINT_STYLE
   if ((settings->seen & SEEN_HINTSTYLE) != 0
       && oldsettings.hintstyle != settings->hintstyle)
     {
@@ -494,7 +667,7 @@ apply_xft_settings (struct x_display_info *dpyinfo,
       ++changed;
       oldsettings.hintstyle = settings->hintstyle;
     }
-# endif
+#endif
 
   if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi
       && settings->dpi > 0)
@@ -545,11 +718,13 @@ apply_xft_settings (struct x_display_info *dpyinfo,
 #endif /* HAVE_XFT */
 }
 
+/* Read XSettings from the display for DPYINFO.
+   If SEND_EVENT_P is non-zero store a Lisp event settings that changed.  */
+
 static void
 read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p)
 {
   struct xsettings settings;
-  Lisp_Object dpyname = XCAR (dpyinfo->name_list_element);
 
   if (!read_settings (dpyinfo, &settings))
     return;
@@ -557,38 +732,29 @@ read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p)
   apply_xft_settings (dpyinfo, True, &settings);
   if (settings.seen & SEEN_TB_STYLE)
     {
-      Lisp_Object style = Qnil;
-      if (strcmp (settings.tb_style, "both") == 0)
-        style = Qboth;
-      else if (strcmp (settings.tb_style, "both-horiz") == 0)
-        style = Qboth_horiz;
-      else if (strcmp (settings.tb_style, "icons") == 0)
-        style = Qimage;
-      else if (strcmp (settings.tb_style, "text") == 0)
-        style = Qtext;
-      if (!NILP (style) && !EQ (style, current_tool_bar_style))
-        {
-          current_tool_bar_style = style;
-          if (send_event_p)
-            store_config_changed_event (Qtool_bar_style, dpyname);
-        }
+      if (send_event_p)
+        store_tool_bar_style_changed (settings.tb_style, dpyinfo);
+      else
+        current_tool_bar_style = map_tool_bar_style (settings.tb_style);
       xfree (settings.tb_style);
     }
-
+#ifdef HAVE_XFT
   if (settings.seen & SEEN_FONT)
     {
-      if (!current_font || strcmp (current_font, settings.font) != 0)
+      if (send_event_p)
+        store_font_name_changed (settings.font);
+      else
         {
           xfree (current_font);
-          current_font = settings.font;
-          if (send_event_p)
-            store_config_changed_event (Qfont_name, dpyname);
+          current_font = xstrdup (settings.font);
         }
-      else
-        xfree (settings.font);
+      xfree (settings.font);
     }
+#endif
 }
 
+/* Check if EVENT for the display in DPYINFO is XSettings related.  */
+
 void
 xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
 {
@@ -630,41 +796,130 @@ xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
     read_and_apply_settings (dpyinfo, True);
 }
 
+/* Initialize GSettings and read startup values.  */
+
+static void
+init_gsettings (void)
+{
+#ifdef HAVE_GSETTINGS
+  GVariant *val;
+  const gchar *const *schemas;
+  int schema_found = 0;
+
+#ifdef HAVE_G_TYPE_INIT
+  g_type_init ();
+#endif
+
+  schemas = g_settings_list_schemas();
+  if (schemas == NULL) return;
+  while (! schema_found && *schemas != NULL)
+    schema_found = strcmp (*schemas++, GSETTINGS_SCHEMA) == 0;
+  if (!schema_found) return;
+
+  gsettings_client = g_settings_new (GSETTINGS_SCHEMA);
+  if (!gsettings_client) return;
+  g_object_ref_sink (G_OBJECT (gsettings_client));
+  g_signal_connect (G_OBJECT (gsettings_client), "changed",
+                    G_CALLBACK (something_changed_gsettingsCB), NULL);
+
+  val = g_settings_get_value (gsettings_client, GSETTINGS_TOOL_BAR_STYLE);
+  if (val)
+    {
+      g_variant_ref_sink (val);
+      if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+        current_tool_bar_style
+          = map_tool_bar_style (g_variant_get_string (val, NULL));
+      g_variant_unref (val);
+    }
+
+#ifdef HAVE_XFT
+  val = g_settings_get_value (gsettings_client, GSETTINGS_MONO_FONT);
+  if (val)
+    {
+      g_variant_ref_sink (val);
+      if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+        current_mono_font = xstrdup (g_variant_get_string (val, NULL));
+      g_variant_unref (val);
+    }
+
+  val = g_settings_get_value (gsettings_client, GSETTINGS_FONT_NAME);
+  if (val)
+    {
+      g_variant_ref_sink (val);
+      if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+        current_font = xstrdup (g_variant_get_string (val, NULL));
+      g_variant_unref (val);
+    }
+#endif /* HAVE_XFT */
+
+#endif /* HAVE_GSETTINGS */
+}
+
+/* Init GConf and read startup values.  */
 
 static void
 init_gconf (void)
 {
-#if defined (HAVE_GCONF) && defined (HAVE_XFT)
+#if defined (HAVE_GCONF)
   char *s;
 
 #ifdef HAVE_G_TYPE_INIT
   g_type_init ();
 #endif
+
   gconf_client = gconf_client_get_default ();
-  s = gconf_client_get_string (gconf_client, SYSTEM_MONO_FONT, NULL);
+  gconf_client_set_error_handling (gconf_client, GCONF_CLIENT_HANDLE_NONE);
+  gconf_client_add_dir (gconf_client,
+                        GCONF_TOOL_BAR_STYLE,
+                        GCONF_CLIENT_PRELOAD_ONELEVEL,
+                        NULL);
+  gconf_client_notify_add (gconf_client,
+                           GCONF_TOOL_BAR_STYLE,
+                           something_changed_gconfCB,
+                           NULL, NULL, NULL);
+
+  s = gconf_client_get_string (gconf_client, GCONF_TOOL_BAR_STYLE, NULL);
+  if (s)
+    {
+      current_tool_bar_style = map_tool_bar_style (s);
+      g_free (s);
+    }
+
+#ifdef HAVE_XFT
+  s = gconf_client_get_string (gconf_client, GCONF_MONO_FONT, NULL);
   if (s)
     {
       current_mono_font = xstrdup (s);
       g_free (s);
     }
-  s = gconf_client_get_string (gconf_client, SYSTEM_FONT, NULL);
+  s = gconf_client_get_string (gconf_client, GCONF_FONT_NAME, NULL);
   if (s)
     {
       current_font = xstrdup (s);
       g_free (s);
     }
-  gconf_client_set_error_handling (gconf_client, GCONF_CLIENT_HANDLE_NONE);
   gconf_client_add_dir (gconf_client,
-                        SYSTEM_MONO_FONT,
+                        GCONF_MONO_FONT,
+                        GCONF_CLIENT_PRELOAD_ONELEVEL,
+                        NULL);
+  gconf_client_notify_add (gconf_client,
+                           GCONF_MONO_FONT,
+                           something_changed_gconfCB,
+                           NULL, NULL, NULL);
+  gconf_client_add_dir (gconf_client,
+                        GCONF_FONT_NAME,
                         GCONF_CLIENT_PRELOAD_ONELEVEL,
                         NULL);
   gconf_client_notify_add (gconf_client,
-                           SYSTEM_MONO_FONT,
-                           something_changedCB,
+                           GCONF_FONT_NAME,
+                           something_changed_gconfCB,
                            NULL, NULL, NULL);
-#endif /* HAVE_GCONF && HAVE_XFT */
+#endif /* HAVE_XFT */
+#endif /* HAVE_GCONF */
 }
 
+/* Init Xsettings and read startup values.  */
+
 static void
 init_xsettings (struct x_display_info *dpyinfo)
 {
@@ -689,8 +944,12 @@ xsettings_initialize (struct x_display_info *dpyinfo)
   if (first_dpyinfo == NULL) first_dpyinfo = dpyinfo;
   init_gconf ();
   init_xsettings (dpyinfo);
+  init_gsettings ();
 }
 
+/* Return the system monospaced font.
+   May be NULL if not known.  */
+
 const char *
 xsettings_get_system_font (void)
 {
@@ -698,6 +957,9 @@ xsettings_get_system_font (void)
 }
 
 #ifdef USE_LUCID
+/* Return the system font.
+   May be NULL if not known.  */
+
 const char *
 xsettings_get_system_normal_font (void)
 {
@@ -746,16 +1008,16 @@ syms_of_xsettings (void)
   current_mono_font = NULL;
   current_font = NULL;
   first_dpyinfo = NULL;
+#ifdef HAVE_GSETTINGS
+  gsettings_client = NULL;
+#endif
 #ifdef HAVE_GCONF
   gconf_client = NULL;
 #endif
 
-  Qmonospace_font_name = intern_c_string ("monospace-font-name");
-  staticpro (&Qmonospace_font_name);
-  Qfont_name = intern_c_string ("font-name");
-  staticpro (&Qfont_name);
-  Qfont_render = intern_c_string ("font-render");
-  staticpro (&Qfont_render);
+  DEFSYM (Qmonospace_font_name, "monospace-font-name");
+  DEFSYM (Qfont_name, "font-name");
+  DEFSYM (Qfont_render, "font-render");
   defsubr (&Sfont_get_system_font);
   defsubr (&Sfont_get_system_normal_font);
 
@@ -772,14 +1034,13 @@ If this variable is nil, Emacs ignores system font changes.  */);
 
 #ifdef HAVE_XFT
   Fprovide (intern_c_string ("font-render-setting"), Qnil);
-#ifdef HAVE_GCONF
+#if defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
   Fprovide (intern_c_string ("system-font-setting"), Qnil);
 #endif
 #endif
 
   current_tool_bar_style = Qnil;
-  Qtool_bar_style = intern_c_string ("tool-bar-style");
-  staticpro (&Qtool_bar_style);
+  DEFSYM (Qtool_bar_style, "tool-bar-style");
   defsubr (&Stool_bar_get_system_style);
 
   Fprovide (intern_c_string ("dynamic-setting"), Qnil);
diff --git a/src/xterm.c b/src/xterm.c
index bc7592795c4..20516ee9d6f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10698,11 +10698,8 @@ syms_of_xterm (void)
   staticpro (&last_mouse_scroll_bar);
   last_mouse_scroll_bar = Qnil;
 
-  staticpro (&Qvendor_specific_keysyms);
-  Qvendor_specific_keysyms = intern_c_string ("vendor-specific-keysyms");
-
-  staticpro (&Qlatin_1);
-  Qlatin_1 = intern_c_string ("latin-1");
+  DEFSYM (Qvendor_specific_keysyms, "vendor-specific-keysyms");
+  DEFSYM (Qlatin_1, "latin-1");
 
   staticpro (&last_mouse_press_frame);
   last_mouse_press_frame = Qnil;
@@ -10711,8 +10708,7 @@ syms_of_xterm (void)
   xg_default_icon_file = make_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg");
   staticpro (&xg_default_icon_file);
 
-  Qx_gtk_map_stock = intern_c_string ("x-gtk-map-stock");
-  staticpro (&Qx_gtk_map_stock);
+  DEFSYM (Qx_gtk_map_stock, "x-gtk-map-stock");
 #endif
 
   DEFVAR_BOOL ("x-use-underline-position-properties",