merge and fixes

103 files changed, 5075 insertions, 3780 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index b959baae8f3..5ecdaa4a572 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -21,6 +21,8 @@
 
 # Force loading of symbols, enough to give us gdb_valbits etc.
 set main
+# With some compilers, we need this to give us struct Lisp_Symbol etc.:
+set Fmake_symbol
 
 # Find lwlib source files too.
 dir ../lwlib
@@ -889,6 +891,19 @@ Print the address of the char-table $, and its purpose.
 This command assumes that $ is an Emacs Lisp char-table value.
 end
 
+define xsubchartable
+  xgetptr $
+  print (struct Lisp_Sub_Char_Table *) $ptr
+  xgetint $->depth
+  set $depth = $int
+  xgetint $->min_char
+  printf "Depth: %d, Min char: %d (0x%x)\n", $depth, $int, $int
+end
+document xsubchartable
+Print the address of the sub-char-table $, its depth and min-char.
+This command assumes that $ is an Emacs Lisp sub-char-table value.
+end
+
 define xboolvector
   xgetptr $
   print (struct Lisp_Bool_Vector *) $ptr
diff --git a/src/ChangeLog b/src/ChangeLog
index a32558a2ac7..16c20e188b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,1037 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.
+        (LINKER_WAS_SPECIFIED): Remove.
+
+        * Makefile.in (LIB_GCC): Set using configure, not cpp.
+        (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
+        * m/arm.h (LIB_GCC) [GNU_LINUX]:
+        * s/cygwin.h (LIB_GCC):
+        * s/freebsd.h (LIB_GCC):
+        * s/gnu-linux.h (LIB_GCC):
+        * s/msdos.h (LIB_GCC):
+        * s/netbsd.h (LIB_GCC):
+        Move to configure.
+
+2010-05-11  Karel Klic  <kklic@redhat.com>
+
+        * ftfont.c: Fix incorrect parentheses of #if condition for
+        definining M17N_FLT_USE_NEW_FEATURE.
+
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+        * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
+
+2010-05-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (init_iterator): Don't turn on bidi reordering in
+        unibyte buffers.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
+
+2010-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
+        (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM.
+        (LIBES): Use LIBS_SYSTEM as a variable.
+        * s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM.  Always define.
+        * s/aix4-2.h (LIBS_SYSTEM):
+        * s/freebsd.h (LIBS_SYSTEM):
+        * s/hpux10-20.h (LIBS_SYSTEM):
+        * s/sol2-6.h (LIBS_SYSTEM):
+        * s/unixware.h (LIBS_SYSTEM):
+        Move to configure.
+
+        * s/aix4-2.h (MAIL_USE_LOCKF):
+        * s/bsd-common.h (MAIL_USE_FLOCK):
+        * s/darwin.h (MAIL_USE_FLOCK):
+        * s/gnu-linux.h (MAIL_USE_FLOCK):
+        * s/irix6-5.h (MAIL_USE_FLOCK):
+        * s/template.h (MAIL_USE_FLOCK):
+        Move to configure.
+
+2010-05-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 23.2 released.
+
+2010-05-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * composite.c (autocmp_chars): Save point as marker before calling
+        auto-composition-function (Bug#5984).
+
+        * lisp.h (restore_point_unwind): Add prototype.
+
+        * fileio.c (restore_point_unwind): Remove static attribute.
+
+2010-05-08  Kenichi Handa  <handa@m17n.org>
+
+        * ftfont.c (M17N_FLT_USE_NEW_FEATURE): Define it if we can use the
+        new feature of libotf and m17n-flt.
+        (ftfont_check_otf) [M17N_FLT_USE_NEW_FEATURE]:
+        Call OTF_check_features even if no specific feature is given.
+        (PACK_OTF_TAG) [M17N_FLT_USE_NEW_FEATURE]: New macro.
+        (ftfont_drive_otf) [M17N_FLT_USE_NEW_FEATURE]: Handle the case
+        that OUT is NULL.  Use OTF_drive_gsub_with_log and
+        OTF_drive_gpos_with_log instead of OTF_drive_gsub and
+        OTF_drive_gpos.
+        (ftfont_try_otf) [M17N_FLT_USE_NEW_FEATURE]: New function.
+        (ftfont_shape_by_flt) [M17N_FLT_USE_NEW_FEATURE]:
+        Setup mflt_enable_new_feature and mflt_try_otf.
+
+2010-05-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (Ftool_bar_get_system_style): Correct comment.
+
+        * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle
+        box and toolbar (Bug #6139).
+        (xg_create_tool_bar): Remove comment (Bug #6139).
+        (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139).
+        (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139).
+
+2010-05-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/eval.$(O), $(BLD)/w32fns.$(O)):
+        Update dependencies.
+
+2010-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * fringe.c (update_window_fringes): Set up truncation bitmaps for
+        R2L lines.
+
+2010-05-08  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
+
+        * Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
+        (TERMCAP_OBJ): New, set by configure, replacing termcapobj.
+        (termcapobj): Replace with TERMCAP_OBJ.
+        (otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
+        (LIBES): Use LIBS_TERMCAP as a variable.
+
+        * s/freebsd.h (osreldate.h): No longer include, since this file
+        does not use __FreeBSD_version any more.
+
+        * s/aix4-2.h (TERMINFO):
+        * s/cygwin.h (TERMINFO):
+        * s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/freebsd.h (TERMINFO, LIBS_TERMCAP):
+        * s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
+        * s/irix6-5.h (TERMINFO):
+        * s/netbsd.h (LIBS_TERMCAP):
+        * s/openbsd.h (TERMINFO, LIBS_TERMCAP):
+        * s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
+        * s/usg5-4.h (TERMINFO):
+        Move to configure.
+
+2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (unbind_to): Don't unbind a local binding into the global
+        binding when the local binding disappeared.  Inversely, don't unbind
+        a global binding into a newly created local binding.
+        * data.c (set_internal): Make its `buf' arg into a `where' arg so we
+        can specify the frame to use, when applicable.  Adjust callers.
+
+2010-05-07  Vincent Belaïche  <vincent.belaiche@gmail.com>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * floatfns.c (Fisnan, Fcopysign, Ffrexp, Fldexp): New functions.
+
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c: Include w32.h.
+        (Fw32_shell_execute): Decode the error message before passing it
+        to `error'.  (Bug#6126)
+
+        * msdos.c (dos_set_window_size):
+        * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
+        instead of `XSYMBOL (foo)->value'.
+
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix the MS-DOS build, broken by autoconfiscation.
+
+        * Makefile.in: Don't use Make-style comments past the "start of
+        cpp stuff" line.
+        (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
+
+        * s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
+        edited directly by msdos/sed1v2.inp).
+
+2010-05-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
+        (LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure.
+        (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA,
+        move out of cpp section.
+        * s/freebsd.h (LD_SWITCH_SYSTEM):
+        * s/gnu-linux.h (LD_SWITCH_SYSTEM):
+        * s/netbsd.h (LD_SWITCH_SYSTEM):
+        * s/openbsd.h (LD_SWITCH_SYSTEM): Move to configure.in.
+
+2010-05-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Define LIB_STANDARD and START_FILES using autoconf.
+        * s/usg5-4.h (LIB_STANDARD):
+        * s/netbsd.h (START_FILES):
+        * s/irix6-5.h (LIB_STANDARD):
+        * s/hpux10-20.h (LIB_STANDARD, START_FILES):
+        * s/gnu-linux.h (START_FILES, LIB_STANDARD):
+        * s/freebsd.h (START_FILES):
+        * s/darwin.h (START_FILES):
+        * s/cygwin.h (START_FILES):
+        * s/aix4-2.h (LIB_STANDARD):
+        * m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
+        * Makefile.in (STARTFILES): Rename to START_FILES, define using
+        autoconf, not cpp.
+
+2010-05-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove NEED_BSDTTY and NEED_UNISTD_H.
+        * s/hpux10-20.h (NEED_BSDTTY): Remove.
+        * s/aix4-2.h (NEED_UNISTD_H): Remove.
+        * systty.h: Simplify conditionals for including <sys/bsdtty.h>,
+        <sys/ptyio.h> and <unistd.h>.
+
+        * emacs.c (main): Remove NO_DIR_LIBRARY conditional, unused.
+
+        * Makefile.in (STARTFILES): Conditionally define to make the usage clear.
+        * s/gnu.h (START_FILES): Remove empty definition.
+
+2010-05-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
+
+2010-05-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (CPP, LN_S): Remove unused variables.
+
+2010-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (Fchar_syntax): Check the arg is a character (bug#6080).
+
+2010-05-05  Lawrence Mitchell  <wence@gmx.li>
+
+        * m/sparc.h: Fix typo in earlier change.
+
+2010-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Misc tweaks.
+        * eval.c (Fdefvaralias): Remove unintended nested if.
+        (internal_condition_case_2, internal_condition_case_n): Use ANSI type.
+
+2010-05-04  Bernhard Herzog  <bh@intevation.de>  (tiny change)
+
+        * xsmfns.c (smc_save_yourself_CB): strlen(client_id) => strlen(cwd).
+
+2010-05-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove BSD_PGRPS.
+        * s/bsd-common.h (BSD_PGRPS): Remove undef.
+        * s/gnu-linux.h (BSD_PGRPS): Remove.
+        * term.c (dissociate_if_controlling_tty):
+        * sysdep.c (narrow_foreground_group, widen_foreground_group)
+        (init_sys_modes, reset_sys_modes):
+        * emacs.c (main):
+        * callproc.c (Fcall_process, child_setup): Remove code depending
+        on BSD_PGRPS.
+
+        Remove POSIX_SIGNALS.
+        * s/usg5-4.h (POSIX_SIGNALS):
+        * s/netbsd.h (POSIX_SIGNALS):
+        * s/msdos.h (POSIX_SIGNALS):
+        * s/ms-w32.h (POSIX_SIGNALS):
+        * s/hpux11.h (POSIX_SIGNALS):
+        * s/gnu.h (POSIX_SIGNALS):
+        * s/gnu-linux.h (POSIX_SIGNALS):
+        * s/freebsd.h (POSIX_SIGNALS):
+        * s/darwin.h (POSIX_SIGNALS):
+        * s/cygwin.h (POSIX_SIGNALS):
+        * s/aix4-2.h (POSIX_SIGNALS): Remove definition.
+        * s/unixware.h:
+        * s/sol2-6.h: Remove comments on POSIX_SIGNALS.
+        * process.c (create_process):
+        * syssignal.h:
+        * sysdep.c (wait_for_termination, init_signals):
+        * process.c (create_process):
+        * msdos.c: POSIX_SIGNALS is always defined on all platforms,
+        remove all code that assumes the contrary.
+
+2010-05-04  Glenn Morris  <rgm@gnu.org>
+
+        * s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
+        variable.
+        * s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
+        (LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
+        * s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
+        (LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
+        LD_SWITCH_SYSTEM_tmp.
+        * Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
+        New variables, set by configure.
+
+        * s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
+        * s/darwin.h (HEADERPAD_EXTRA, LIBS_NSGUI): Remove.
+        (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
+        * Makefile.in (LD_SWITCH_SYSTEM_TEMACS): New variable, set by configure.
+        (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM_TEMACS.
+
+        * s/aix4-2.h (C_SWITCH_SYSTEM):
+        * m/alpha.h (C_SWITCH_MACHINE):
+        Move to configure.in.
+        * Makefile.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM):
+        New variables, set by configure.
+        (ALL_CFLAGS): Use $C_SWITCH_MACHINE and $C_SWITCH_SYSTEM in place of
+        $c_switch_machine and $c_switch_system.
+
+2010-05-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/hpux10-20.h (LIB_STANDARD): New definition.
+        * Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
+        on it, not used anymore.
+
+2010-05-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eval.c (internal_condition_case_n): Rename from
+        internal_condition_case_2.
+        (internal_condition_case_2): New function.
+
+        * xdisp.c (safe_call): Use internal_condition_case_n.
+
+        * fileio.c (Fdelete_file, internal_delete_file): New arg FORCE.
+        (internal_delete_file, Frename_file): Callers changed.
+
+        * buffer.c (Fkill_buffer):
+        * callproc.c (delete_temp_file): Callers changed (Bug#6070).
+
+        * lisp.h: Update prototypes.
+
+2010-05-03  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
+        (LIBXT_OTHER, LIBX_OTHER): New, set by configure.
+        (LIBXT): Set with configure, not cpp.
+        (LIBX): Remove.
+        (LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
+
+2010-05-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.
+        The FreeBSD is not needed, the default works, Solaris version is
+        not needed, and the remaining case is not supported by configure.
+
+2010-05-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsmfns.c (CHDIR_OPT): New define.
+        (smc_save_yourself_CB): Add CHDIR_OPT to options to use when
+        restarting emacs.
+
+        * xterm.c (x_connection_closed): Call Fkill_emacs instead of
+        shut_down_emacs.
+
+        * emacs.c (USAGE1): Mention --chdir.
+        (main): Handle --chdir.
+        (standard_args): Add --chdir.
+        (fatal_error_signal): Call Fkill_emacs for SIGTERM and SIGHUP (Bug
+        #5552).
+
+2010-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove LD_SWITCH_MACHINE.
+        * Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
+        (TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.
+
+        Clean up IRIX code.
+        * m/iris4d.h (TERMINFO, FIRST_PTY_LETTER): Move definitions ...
+        * s/irix6-5.h (TERMINFO, FIRST_PTY_LETTER): ... here.
+
+        Clean up AIX code.
+        * m/ibmrs6000.inp: Remove file, unused.
+        * m/ibmrs6000.h (IBMR2AIX): Remove, unused.
+        (LD_SWITCH_MACHINE): Rename to LD_SWITCH_SYSTEM_TEMACS, and move
+        definition ...
+        * s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): ... here.
+
+        * sysdep.c (child_setup_tty, init_sys_modes): Remove !IBMR2AIX code,
+        unused.
+
+2010-05-01  Eli Zaretskii  <eliz@gnu.org>
+
+        Emulate POSIX_SIGNALS on MS-Windows.
+
+        * s/ms-w32.h (POSIX_SIGNALS, struct sigaction, SIG_BLOCK)
+        (SIG_SETMASK, SIG_UNBLOCK): Define.
+
+        * sysdep.c (sys_signal) [WINDOWSNT]: #ifdef away.
+        (wait_for_termination) [WINDOWSNT]: Move MS-Windows specific code
+        from non-POSIX_SIGNALS section to POSIX_SIGNALS section.
+
+        * w32.c (sigemptyset, sigaddset, sigfillset, sigprocmask):
+        New stubs.
+
+        Miscellaneous fixes of bidi display.
+
+        * xdisp.c (find_row_end): New function, refactored from display_line.
+        (display_line): Use it.
+        (extend_face_to_end_of_line): In almost-filled rows, extend only
+        if the row is R2L and not continued.
+        (display_line): Fix prepending of truncation glyphs to R2L rows.
+        Preserve overlay and string info in row->end.
+        (insert_left_trunc_glyphs): Support addition of left truncation
+        glyphs to R2L rows.
+        (set_cursor_from_row): Don't place cursor on the vertical border
+        glyph between adjacent windows.  Fix a crash when a display string
+        is continued to the next line.  Don't return zero if cursor was
+        found by `cursor' property of a display string.
+        (try_cursor_movement): Don't assume that row->end == (row+1)->start,
+        test for that explicitly.
+
+2010-05-01  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
+        for clarity.
+        (OTHER_OBJ): Remove.
+        (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
+        (otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
+
+2010-05-01  Karel Klíč  <kklic@redhat.com>
+
+        * fileio.c (Ffile_selinux_context): Context functions may return null.
+
+2010-04-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/gnu.h (POSIX_SIGNALS, START_FILES): New definitions.
+
+2010-04-30  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.  (Bug#6065)
+        (OTHER_OBJ): Define as a separate variable, for clarity.
+
+2010-04-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c: include limits.h and update file comment.
+
+2010-04-30  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OLDXMENU, LIBXMENU) [HAVE_MENUS]:
+        Set with configure, not cpp.
+        (LIBW): Remove, replace with $TOOLKIT_LIBW.
+
+        * Makefile.in (mallocobj): Remove.
+        (otherobj): Simplify using @OTHER_OBJ@.
+
+        * Makefile.in (dispnew.o, frame.o, fringe.o, font.o, fontset.o)
+        (keyboard.o, window.o, xdisp.o, xfaces.o, menu.o):
+        Don't bother making nsgui.h dependency platform-specific.
+
+        * Makefile.in (nsfns.o): Remove duplicate nsgui.h dependency.
+
+2010-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * process.c (read_process_output, exec_sentinel): Don't burp if the
+        sentinel/filter kills the current buffer (bug#6060).
+
+        Fix wrong-docstring problem introduced with hash-consing.  (Bug#6008)
+        * eval.c (Fautoload): Set doc to a unique number rather than to 0.
+        Remove unused var `args'.
+        * lisp.h (XSETCARFASTINT, XSETCDRFASTINT): Remove.
+        (LOADHIST_ATTACH): Wrap with do...while to avoid surprises for callers.
+        * doc.c (store_function_docstring): Use XSETCAR.
+
+2010-04-28  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
+        (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
+
+        * Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
+
+        * Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
+        (MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
+
+        * Makefile.in (FONT_OBJ): New, set by configure.
+        (FONT_DRIVERS): Use $FONT_OBJ.
+
+        * Makefile.in (LIBXMU): Set with configure, not cpp.
+        * s/aix4-2.h (LIBXMU):
+        * s/hpux10-20.h (LIBXMU):
+        Remove definition, now set in configure.
+
+        * Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
+
+        * m/amdx86-64.h [i386]: Move this test to configure.in.
+
+2010-04-27  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBXTR6): Set with configure, not cpp.
+        * s/unixware.h (NEED_LIBW): Remove definition.
+
+        * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
+        (TOOLKIT_LIBW): New, set by configure.
+        (@X_TOOLKIT_TYPE@): No longer define it.
+
+        * Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
+        (MOTIF_LIBW): Set with configure, not cpp.
+        * s/aix4-2.h (LIB_MOTIF):
+        * s/gnu-linux.h (LIB_MOTIF):
+        * s/unixware.h (LIB_MOTIF): Move to configure.in.
+
+2010-04-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Reduce CPP usage.
+        * Makefile.in (LIB_X11_LIB): Remove, inline in the only user.
+        (obj): Use autoconf for unexec instead of cpp.
+        (C_SWITCH_SYSTEM, C_SWITCH_MACHINE, C_SWITCH_X_SITE): Remove
+        definitions and undefs.  Inline definitions in the only user.
+        (ALL_CFLAGS): Substitute C_SWITCH_X_SYSTEM using autoconf.
+
+2010-04-27  Glenn Morris  <rgm@gnu.org>
+
+        * m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around,
+        since the defaults (set by the system file) are fine in most cases.
+        [GNU_LINUX, __OpenBSD__, __NetBSD__, __APPLE__]: Remove sections.
+        * m/ibms390x.h (START_FILES, LIB_STANDARD):
+        * m/macppc.h (START_FILES, LIB_STANDARD) [GNU_LINUX]:
+        * m/sparc.h (START_FILES, LIB_STANDARD) [__linux__]:
+        Remove definitions, since they are set correctly in s/gnu-linux.h.
+        * s/freebsd.h (START_FILES, LIB_STANDARD):
+        * s/gnu-linux.h (START_FILES, LIB_STANDARD):
+        * s/hpux10-20.h (START_FILES):
+        * s/netbsd.h (START_FILES, LIB_STANDARD, START_FILES_1, END_FILES_1):
+        Use $CRT_DIR in place of fixed /usr/lib, /lib directories.
+
+        * Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
+        (MOTIF_LIBW): Use $LIBXP.
+        (otherobj): Use $WIDGET_OBJ.
+
+2010-04-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (LIBS_MACHINE): Remove, unused.
+
+        Use autoconf instead of cpp for LIB_MATH.
+        * s/darwin.h (LIB_MATH): Do not define here, move to configure.
+        * s/cygwin.h (LIB_MATH): Likewise.
+        * Makefile.in (LIB_MATH): Do not define with cpp.
+        (LIBES): Use autoconf for LIB_MATH.
+
+2010-04-26  Kenichi Handa  <handa@m17n.org>
+
+        * composite.c (Ffind_composition_internal): Fix the return value
+        for an automatic composition.
+
+2010-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove all NO_ARG_ARRAY uses.
+        * fns.c (concat2, concat3, nconc2):
+        * eval.c (apply1, call1, call2, call3, call4, call5, call6)
+        (call7): Remove NO_ARG_ARRAY usage, assume it's always true.
+        * m/xtensa.h (NO_ARG_ARRAY):
+        * m/template.h (NO_ARG_ARRAY):
+        * m/sparc.h (NO_ARG_ARRAY):
+        * m/sh3.h (NO_ARG_ARRAY):
+        * m/mips.h (NO_ARG_ARRAY):
+        * m/macppc.h (NO_ARG_ARRAY):
+        * m/iris4d.h (NO_ARG_ARRAY):
+        * m/intel386.h (NO_ARG_ARRAY):
+        * m/ibms390x.h (NO_ARG_ARRAY):
+        * m/ibms390.h (NO_ARG_ARRAY):
+        * m/ibmrs6000.h (NO_ARG_ARRAY):
+        * m/ia64.h (NO_ARG_ARRAY):
+        * m/hp800.h (NO_ARG_ARRAY):
+        * m/arm.h (NO_ARG_ARRAY):
+        * m/amdx86-64.h (NO_ARG_ARRAY):
+        * m/alpha.h (NO_ARG_ARRAY): Remove definition.
+
+2010-04-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Don't assume 2nd call to
+        get_next_display_element cannot return zero.  (Bug#6030)
+        (iterate_out_of_display_property): New function, body from pop_it.
+        (pop_it): Use it.
+
+2010-04-24  Glenn Morris  <rgm@gnu.org>
+
+        * m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]:
+        For clarity, revert to using fixed /usr/lib rather than $CRT_DIR.
+        (START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case,
+        since CRT_DIR defaults to /usr/lib.  Suggested by Dan Nicolaescu.
+
+2010-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and
+        use `get_next_display_element' and `set_iterator_to_next' to
+        advance to the next character, when looking for the character that
+        begins the next row.
+
+        * .gdbinit: Add a "set Fmake_symbol" line to force GDB to load the
+        definition of "struct Lisp_Symbol".
+
+2010-04-24  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (CRT_DIR): New variable, set by configure.
+        * m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
+        Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
+
+2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in: Remove C_SWITCH_X_MACHINE, unused.
+
+        * s/cygwin.h (LIBS_DEBUG): Remove, unused.
+
+        Remove redundant flags.
+        * s/freebsd.h (C_SWITCH_SYSTEM):
+        * s/hpux10-20.h (C_SWITCH_X_SYSTEM, LD_SWITCH_X_DEFAULT):
+        * s/netbsd.h (C_SWITCH_SYSTEM):
+        * s/openbsd.h (LD_SWITCH_X_DEFAULT): Remove, configure takes care
+        of these.
+
+        Simplify m/intel386.h.
+        * m/intel386.h (CRT0_DUMMIES): Remove, inline value in the only
+        user: ecrt0.c.
+        (SOLARIS2): Remove LOAD_AVE_TYPE, LOAD_AVE_CVT, LIBS_MACHINE, unused.
+        (USG5_4): Move LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE definitions to
+        the only user: s/unixware.h.
+        * ecrt0.c: Remove #ifndef static.  Inline CRT0_DUMMIES definition
+        from m/intel386.h.
+        * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Definitions
+        moved here from m/intel386.h.
+
+        * m/mips.h: Remove #if 0 code.
+
+2010-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix display of composed characters from L2R scripts in bidi buffers.
+        * xdisp.c (set_iterator_to_next, next_element_from_composition):
+        After advancing IT past the composition, resync the bidi iterator
+        with IT's position.  (Bug#5977)
+
+2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
+        (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
+
+2010-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
+
+2010-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        Support `display' text properties and overlay strings in bidi buffers.
+        * xdisp.c (pop_it): When the stack is popped after displaying
+        from a string, bidi-iterate to exit from the text portion covered
+        by the `display' property or overlay.  (Bug#5988, bug#5920)
+
+2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/macppc.h (LD_SWITCH_SYSTEM_TEMACS): Remove #undef.
+        (LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc.
+
+        * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc.
+        * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.
+
+        Simplify STARTFILES definition.
+        * s/hpux10-20.h (START_FILES): Explicitly define here instead of
+        relying on Makefile.in to define it.
+        * s/cygwin.h (START_FILES): Likewise.
+        * Makefile.in (STARTFILES): Remove conditional code, not needed anymore.
+
+        Clean up Solaris code.
+        * s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS, C_SWITCH_X_SYSTEM)
+        (LIB_MOTIF): Remove, configure takes care of this.
+        (NOT_USING_MOTIF): Remove, unused.
+        * xrdb.c: Remove #if 0-ed #include.
+        (SYSV): Remove conditional for old SysV.
+        * sysdep.c (closedir): Remove conditional code for Solaris,
+        Solaris has closedir.
+
+2010-04-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (read_and_apply_settings): Check if current_font is
+        NULL before strcmp (Bug#6001).
+
+2010-04-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Clean up HP-UX files.
+        * m/hp800.h (NO_REMAP, VIRT_ADDR_VARIES, DATA_SEG_BITS)
+        (DATA_START, TEXT_START, LOAD_AVE_TYPE, LOAD_AVE_CVT)
+        (LDAV_SYMBOL, index, rindex): Move definitions only used in HP-UX ...
+        * s/hpux10-20.h: ... to the only user, here.
+
+2010-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_find_paragraph_start, bidi_at_paragraph_end): Don't
+        use buffer-local values of paragraph-start and paragraph-separate.
+        <paragraph_start_re, paragraph_separate_re>: Rename from
+        fallback_paragraph_start_re and fallback_paragraph_separate_re.
+        (Bug#5992)
+
+2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c: Qmonospace_font_name, Qtool_bar_style and
+        current_tool_bar_style are new.
+        (store_config_changed_event): Rename from store_font_changed_event.
+        (XSETTINGS_TOOL_BAR_STYLE): New define.
+        (SEEN_FONT, SEEN_TB_STYLE): New enum values.
+        (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
+        HAVE_XFT.
+        (something_changedCB): store_font_changed_event is now
+        store_config_changed_event
+        (parse_settings): Rename from parse_xft_settings.  Read
+        non-xft xsettings outside #ifdef HAVE_XFT.
+        (read_settings): Renamed from read_xft_settings.
+        (apply_xft_settings): Take current settings as parameter.  Do not
+        call read_(xft)_settings.
+        (read_and_apply_settings): New function.
+        (xft_settings_event): Do non-xft stuff out of HAVE_XFT.  Call
+        read_and_apply_settings if there are settings to be read.
+        (init_xsettings): Renamed from init_xfd_settings.
+        Call read_and_apply_settings unconditionally.
+        (xsettings_initialize): Call init_xsettings.
+        (Ftool_bar_get_system_style): New function.
+        (syms_of_xsettings): Define Qmonospace_font_name and
+        Qtool_bar_style.  Initialize current_tool_bar_style to nil.
+        defsubr Stool_bar_get_system_style.  Fprovide on
+        dynamic-setting.
+        Move misplaced HAVE_GCONF
+
+        * xsettings.h (Ftool_bar_get_system_style): Declare.
+
+        * xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
+        Qtext, Qboth, Qboth_horiz are new.
+        (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
+        Vtool_bar_style, tool_bar_max_label_size.
+
+        * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
+
+        * keyboard.c: QClabel is new.
+        (parse_tool_bar_item): Take out QClabel from tool bar items.
+        Try to construct a label if ther is no QClabel.
+        (syms_of_keyboard): Intern :label as QClabel.
+
+        * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
+        (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
+        New.
+
+        * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
+        dynamic-setting.el.
+
+        * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
+        (xg_make_tool_item, xg_show_toolbar_item): New function.
+        (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
+        Call xg_make_tool_item to make a tool bar item.
+        Call xg_show_toolbar_item.  Use wtoolbar instead of x->toolbar_widget.
+
+        * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
+        into account for toolbars.
+
+2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * data.c (make_blv): Declarations before code (Bug#5993).
+
+2010-04-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
+        Define using autoconf, not cpp.
+        (LIBXSM): New variable, set by autoconf.
+        (LIBXT): Use $LIBXSM.
+
+2010-04-21  Dan Nicolaescu  <local_user@dannlt>
+
+        Remove NOMULTIPLEJOBS, unused.
+        * s/template.h (NOMULTIPLEJOBS):
+        * s/msdos.h (NOMULTIPLEJOBS): Remove, unused.
+
+        Simplify LD_SWITCH_SYSTEM_TEMACS usage.
+        * s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS):
+        * s/gnu-linux.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure
+        detects -znocombreloc and passes it to the linker
+        * s/hpux10-20.h (LD_SWITCH_SYSTEM_TEMACS): Remove, empty.
+
+2010-04-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBSELINUX_LIBS): Move out of #ifdef.
+
+2010-04-21  Karel Klíč  <kklic@redhat.com>
+
+        * Makefile.in (LIBSELINUX_LIBS): New.
+        (LIBES): Add $LIBSELINUX_LIBS.
+        * eval.c, lisp.h (call7): New function.
+        * fileio.c [HAVE_LIBSELINUX]: Include selinux headers.
+        (Ffile_selinux_context, Fset_file_selinux_context):
+        New functions.
+        (Fcopy_file): New parameter preserve-selinux-context.
+        (Frename_file): Preserve selinux context when renaming by copy-file.
+
+2010-04-21  Juanma Barranquero  <lekktu@gmail.com>
+            Eli Zaretskii  <eliz@gnu.org>
+
+        Don't depend on cm.c or termcap.c on Windows, use stubs.
+        * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O).
+        ($(BLD)/cm.$(O), $(BLD)/termcap.$(O)): Remove.
+        * w32console.c (current_tty, cost): New vars; lifted from cm.c.
+        (evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear)
+        (sys_tputs, sys_tgetstr): New stubs.
+        * s/ms-w32.h (chcheckmagic, cmcostinit, cmgoto, cmputc, Wcm_clear)
+        (tputs, tgetstr): New; define to sys_*.
+
+2010-04-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buffer.c (syms_of_buffer) <bidi-display-reordering>: Doc fix.
+
+2010-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * data.c (Fmake_variable_buffer_local, Fmake_local_variable):
+        Just signal a warning rather than an error when inside a let.
+        (Fmake_variable_frame_local): Add the same test.
+
+        * font.c (syms_of_font): Make the style table vars read-only.
+
+        * buffer.h (struct buffer): Remove unused var `direction_reversed'.
+        * buffer.c (init_buffer_once, syms_of_buffer): Remove its initialization.
+
+        * bidi.c (bidi_initialize): Simplify fallback_paragraph_*_re init.
+
+2010-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix R2L paragraph display on TTY.
+
+        * xdisp.c (unproduce_glyphs): New function.
+        (display_line): Use it when produced glyphs are discarded from R2L
+        glyph rows.
+        (append_composite_glyph): In R2L rows, prepend the glyph rather
+        than appending it.
+
+        * term.c (append_composite_glyph): In R2L rows, prepend the glyph
+        rather than append it.  Set up the resolved_level and bidi_type
+        attributes of the appended glyph.
+        (produce_special_glyphs): Mirror the backslash continuation
+        character in R2L lines.
+
+        Implement display of R2L paragraphs in GUI sessions.
+
+        * xdisp.c [HAVE_WINDOW_SYSTEM]: Add prototype for
+        append_stretch_glyph.
+        (set_cursor_from_row) <cursor_x>: Remove unused variable.  Fix
+        off-by-one error in computing x at end of text in the row.
+        (append_stretch_glyph): In reversed row, prepend the glyph rather
+        than append it.  Set resolved_level and bidi_type of the glyph.
+        (extend_face_to_end_of_line): If the row is reversed, prepend a
+        stretch glyph whose width is such that the rightmost glyph will be
+        drawn at the right margin of the window.  Fix off-by-one error on
+        TTY frames in testing whether a line needs face extension.  Fix
+        face extension at ZV.  If this is the last glyph row, use
+        DEFAULT_FACE_ID, to avoid painting the rest of the window with the
+        region face.
+        (set_cursor_from_row, display_line): Use
+        MATRIX_ROW_CONTINUATION_LINE_P instead of testing value of
+        row->continuation_lines_width.
+        (next_element_from_buffer): Don't call bidi_paragraph_init if we
+        are at ZV.  Fixes a crash when reseated to ZV by
+        try_window_reusing_current_matrix.
+        (display_and_set_cursor, erase_phys_cursor): Handle negative HPOS,
+        which happens with R2L glyph rows.  Fixes a crash when inserting a
+        character at end of an R2L line.
+        (set_cursor_from_row): Don't be fooled by truncated rows: don't
+        treat them as having zero-width characters.  Improve comments.
+        Don't reverse pos_before and pos_after for reversed glyph rows.
+        Set cursor.x to negative value when the cursor might be on the
+        left fringe.
+        (IT_OVERFLOW_NEWLINE_INTO_FRINGE): For R2L lines, consider the
+        left fringe, not the right one.
+        (notice_overwritten_cursor, draw_phys_cursor_glyph)
+        (erase_phys_cursor): For reversed cursor_row, support cursor on
+        the left fringe.
+
+        * fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
+        of continuation indicators on the fringes.
+        (draw_fringe_bitmap): For reversed glyph rows, allow cursor on the
+        left fringe.
+
+        * w32term.c (w32_draw_window_cursor): For reversed glyph rows,
+        draw cursor on the left fringe.
+
+        * xterm.c (x_draw_window_cursor): For reversed glyph rows, draw
+        cursor on the left fringe.
+
+        * dispnew.c (update_text_area): Handle reversed desired rows when
+        the cursor is on the left fringe.
+        (set_window_cursor_after_update): Limit cursor's hpos by -1 from
+        below, not by 0, for when the cursor is on the left fringe.
+
+2010-04-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_event_is_for_scrollbar): Check if grabbed
+        widget is a scrollbar.
+
+2010-04-20  Kenichi Handa  <handa@m17n.org>
+
+        * charset.c (char_charset): Consider Vcharset_non_preferred_head
+        only when the arg CHARSET_LIST is nil.
+
+2010-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Make variable forwarding explicit rather the using special values.
+        Basically, this makes the structure of buffer-local values and object
+        forwarding explicit in the type of Lisp_Symbols rather than use
+        special Lisp_Objects for that.  This tends to lead to slightly more
+        verbose code, but is more C-like, simpler, and makes it easier to make
+        sure we handled all cases, among other things by letting the compiler
+        help us check it.
+        * lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
+        Removing forwarding objects.
+        (enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
+        (struct Lisp_Symbol): Make the various forms of variable-forwarding
+        explicit rather than hiding them inside Lisp_Object "values".
+        (XFWDTYPE): New macro.
+        (XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
+        (XBUFFER_LOCAL_VALUE): Remove.
+        (SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
+        (SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
+        (SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
+        (struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
+        (struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
+        Remove the Lisp_Misc_* header.
+        (struct Lisp_Buffer_Local_Value): Redefine.
+        (BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
+        (struct Lisp_Misc_Any): Add filler to get the right size.
+        (struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
+        Lisp_Intfwd.
+        (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
+        (DEFVAR_KBOARD): Allocate a forwarding object.
+        * data.c (do_blv_forwarding, store_blv_forwarding): New macros.
+        (let_shadows_global_binding_p): New function.
+        (union Lisp_Val_Fwd): New type.
+        (make_blv): New function.
+        (swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
+        (store_symval_forwarding, swap_in_global_binding, Fboundp)
+        (swap_in_symval_forwarding, find_symbol_value, Fset)
+        (let_shadows_buffer_binding_p, set_internal, default_value)
+        (Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
+        (Fkill_local_variable, Fmake_variable_frame_local)
+        (Flocal_variable_p, Flocal_variable_if_set_p)
+        (Fvariable_binding_locus):
+        * xdisp.c (select_frame_for_redisplay):
+        * lread.c (Fintern, Funintern, init_obarray, defvar_int)
+        (defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
+        * frame.c (store_frame_param):
+        * eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
+        * bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
+        value structure.
+        * buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
+        (clone_per_buffer_values): Only adjust markers into the current buffer.
+        (reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
+        (Fbuffer_local_value, set_buffer_internal_1)
+        (swap_out_buffer_local_variables):
+        Adapt to the new symbol value structure.
+        (DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
+        (defvar_per_buffer): Take a new arg for the fwd object.
+        (buffer_lisp_local_variables): Return a proper alist (different fix
+        for bug#4138).
+        * alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
+        (Fgarbage_collect): Don't handle buffer_defaults specially.
+        (mark_object): Handle new symbol value structure rather than the old
+        special Lisp_Misc_* objects.
+        (gc_sweep) <symbols>: Free also the buffer-local-value objects.
+        * term.c (set_tty_color_mode):
+        * bidi.c (bidi_initialize): Don't access the ->value field directly.
+        * buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
+        a buffer_local_flags.
+        * print.c (print_object): Get rid of impossible forwarding objects.
+
+2010-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_get_type, bidi_get_category)
+        (bidi_at_paragraph_end, bidi_resolve_weak, bidi_resolve_neutral)
+        (bidi_type_of_next_char, bidi_level_of_next_char):
+        Declare static.  Use `INLINE' rather than `inline'.
+
+2010-04-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dired.c (Ffile_attributes): Fix typo in docstring.
+
+2010-04-19  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+        * nsmenu.m (EmacsDialog-runDialogAt:): Declare ret as
+        NSInteger (Bug#5811).
+
+2010-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * s/darwin.h (PTY_ITERATION, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF)
+        (PTY_OPEN): New defines.  Use openpty (Bug#726, Bug#5819).
+
+2010-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.h (FRAME_LINE_TO_PIXEL_Y): Add missing parenthesis.
+
+2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+        terminal frames (Bug#5837).
+
+2010-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (xsubchartable): New command.
+
+2010-04-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Don't write beyond the last glyph row in
+        the desired matrix.  Fixes a crash in "emacs -nw" (bug#5972), see
+        http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00075.html
+        and
+        http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00213.html
+
+2010-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * alloc.c (Fpurecopy): Hash-cons if requested.
+        (syms_of_alloc): Update purify-flag docstring.
+
+2010-04-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_set_geometry): Set size in geometry string also.
+        (x_wm_set_size_hint): Set USER_POS in hint_flags (Bug#5968).
+
+2010-04-17  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a crash when an NSM character is inserted at BEGV.
+
+        * bidi.c (bidi_init_it): Fix initialization of bidi_it->prev.
+        (bidi_resolve_weak): Don't use prev.type_after_w1 if it is
+        NEUTRAL_B or UNKNOWN_BT.
+
+2010-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Don't consider possibility of
+        other rows with cursor unless they are different from this row and
+        this row is part of a continued line.  (Bug#5943)
+
+2010-04-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/freebsd.h: Restore osreldate.h include.
+        Suggested by Naohiro Aota.
+
+2010-04-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
+
+2010-04-16  Ken Brown  <kbrown@cornell.edu>  (tiny change)
+
+        * s/cygwin.h: Avoid linking against static libgcc.
+
+2010-04-15  Juri Linkov  <juri@jurta.org>
+
+        * window.c: Add Qscroll_command.
+        Remove Vscroll_preserve_screen_position_commands.
+        (window_scroll_pixel_based, window_scroll_line_based): Check the
+        `scroll-command' property on the last command instead of searching
+        the last command in Vscroll_preserve_screen_position_commands.
+        (syms_of_window): Initialize and staticpro `Qscroll_command'.
+        Put Qscroll_command property on Qscroll_up and Qscroll_down.
+        (scroll-preserve-screen-position): Doc fix.
+        (Vscroll_preserve_screen_position_commands): Remove variable.
+
+2010-04-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xdisp.c (message): Do not use NO_ARG_ARRAY.
+
 2010-04-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Reduce cpp use in Makefile.in.
@@ -62,7 +1096,8 @@
 
 2010-04-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * Makefile.in (C_SWITCH_SYSTEM,C_SWITCH_MACHINE,C_SWITCH_X_SITE): Undefine.
+        * Makefile.in (C_SWITCH_SYSTEM,C_SWITCH_MACHINE,C_SWITCH_X_SITE):
+        Undefine.
 
 2010-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -136,10 +1171,10 @@
         (parse_xft_settings): Also check for XSETTINGS_FONT_NAME and save that
         in current_font.
         (init_gconf): Read value of SYSTEM_FONT and save it in current_font.
-        (Ffont_get_system_normal_font, xsettings_get_system_normal_font): New
-        functions.
-        (syms_of_xsettings): Initialize current_font. defsubr
-        Sfont_get_system_normal_font.
+        (Ffont_get_system_normal_font, xsettings_get_system_normal_font):
+        New functions.
+        (syms_of_xsettings): Initialize current_font.
+        defsubr Sfont_get_system_normal_font.
 
         * xsettings.h (Ffont_get_system_normal_font,
         xsettings_get_system_normal_font): Declare.
@@ -284,6 +1319,11 @@
         (gif_load): Put GIF extension data to the property
         `Qextension_data'.
 
+2010-04-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+        terminal frames (Bug#5837).
+
 2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
 
         * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
@@ -2761,7 +3801,7 @@
         * xterm.h: Rename x_non_menubar_window_to_frame to
         x_menubar_window_to_frame.
 
-        * xterm.c: Remove declarations also in xterm.h
+        * xterm.c: Remove declarations also in xterm.h.
         (XTmouse_position): Do not return valid positions
         for clicks in the menubar and the toolbar for Gtk+.
 
@@ -3321,7 +4361,7 @@
 2009-07-04  Eli Zaretskii  <eliz@gnu.org>
 
         Emulation of `getloadavg' on MS-Windows.
-        * w32.c: Include float.h
+        * w32.c: Include float.h.
         (g_b_init_get_native_system_info, g_b_init_get_system_times)
         (GetNativeSystemInfo_Proc, GetSystemTimes_Proc): Declare.
         (get_native_system_info, get_system_times): New functions.
@@ -7913,7 +8953,7 @@
         <after-change-functions>: Reflow docstrings.
 
 2008-08-04  Adrian Robert  <Adrian.B.Robert@gmail.com>
-            Ken Raeburn  <raeburn@gnu.org>
+            Ken Raeburn  <raeburn@gnu.org>
 
         Dock menu customization, based on a patch by Ken Raeburn, plus some
         other fixes.
@@ -8978,7 +10018,7 @@
         batch-compiling for bootstrap).
 
 2008-07-15  Chris Hall  <chris@web.workinglinux.com>  (tiny change)
-            YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+            YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case --
         fix crash due to different init order.
@@ -9267,7 +10307,7 @@
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * fileio.c:
-        * sysdep.c
+        * sysdep.c:
         * systty.h:
         * m/ibmrs6000.h:
         * m/iris4d.h:
@@ -9596,7 +10636,7 @@
         (USG_SHARED_LIBRARIES): Remove duplicate definition.
 
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+            Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (LOCAL_FLAGS):
         Don't include WINDOWSNT, DOS_NT and _UCHAR_T.
@@ -9844,7 +10884,7 @@
         the property of LFACE_FONT of LFACE (if any).
 
 2008-06-21  Seiji Zenitani  <zenitani@mac.com>
-            Ryo Yoshitake  <ryo@shiftmode.net>
+            Ryo Yoshitake  <ryo@shiftmode.net>
 
         * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437.
 
@@ -10940,7 +11980,7 @@
         * xterm.c (x_set_frame_alpha): Move declarations before statements.
 
 2008-05-21  Seiji Zenitani  <zenitani@mac.com>
-            Ryo Yoshitake  <ryo@shiftmode.net>
+            Ryo Yoshitake  <ryo@shiftmode.net>
 
         * frame.c (Qalpha): Add a new frame parameter `alpha'.
         (Vframe_alpha_lower_limit): New variable.
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 921123f236a..8b4a9afbc6c 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -1187,7 +1187,7 @@
         prompt.
         (various): Pass window being displayed as arg to vmotion.
         (various): Compute starting-hpos arg to compute_motion
-         using minibuf_prompt_width if in minibuf starting at top.
+        using minibuf_prompt_width if in minibuf starting at top.
 
         * window.c (Fdisplay_buffer & callers):
         Take second arg, non-nil means do not use selected window
@@ -1645,8 +1645,8 @@
         Use signal, not sigset, since we simulate signal on
         all system versions when nec.
 
-        * buffer.c (syms_of_buffer, init_buffer_once,
-                    reset_buffer_local_variables):
+        * buffer.c (syms_of_buffer, init_buffer_once)
+        (reset_buffer_local_variables):
         Define default-abbrev-mode, and init new buffers' abbrev-mode
         from it.  Move definition of abbrev-mode here from abbrev.c.
 
@@ -2861,7 +2861,7 @@
         * keymap.c, callint.c, minibuf.c, fns.c, commands.h:
         Rename MinbufLocalMap to Vminibuffer_local_map, etc.
         Rename minibuf-local-{,-ns,-completion,must-match}map,
-         and DefLispVar them (document even!).
+        and DefLispVar them (document even!).
         => New lisp variables minibuffer-local-map, minibuffer-local-ns-map,
         minibuffer-local-completion-map, minibuffer-local-must-match-map.
 
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 265cc95e60d..7313f56ae8e 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -984,7 +984,7 @@
 1988-01-06  Richard Stallman  (rms@frosted-flakes)
 
         * s-hpux.h: Don't define nomultiplejobs, LDAV_SYMBOL, LIBS_DEBUG
-         or BROKEN_FIONREAD.
+        or BROKEN_FIONREAD.
         * m-hp9000s300.h: Define those four.
         * s-hpux.h: Define BSTRING, and define bcopy, etc., as macros.
 
@@ -2817,7 +2817,7 @@
 1986-11-26  Richard M. Stallman  (rms@prep)
 
         * sysdep.c (get_system_name):
-         Eliminate internal static var in USG case.
+        Eliminate internal static var in USG case.
 
         * lisp.h: New case testing and conversion macros
         UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, DOWNCASE.
@@ -3852,7 +3852,7 @@
         (so now (let ((case-fold-search t))) doesn't force buffer-localness)
         However, setting a binding will still make it buffer-local.
         (ie (let ((case-fold-search t)) (setq case-fold-search t))
-         will cause case-fold-search be buffer-local even outside the let)
+        will cause case-fold-search be buffer-local even outside the let)
 
         * xfns.c:
         Preserve studlycaps: "Gnuemacs" => "GNU Emacs"
@@ -4452,16 +4452,16 @@
         * search.c (Freplace_match): Delete unused some_multiletter_word init.
         * alloc.c (gc_sweep): Delete unused next initializers.
         * fns.c (concat): After error on non-int elt for string,
-           do store the new value from the error handler.
+        do store the new value from the error handler.
         * lread.c (read1): Comment out unused end =.
         * lread.c (read_list): Delete unused tail =.
         * data.c (Fmake_variable_buffer_local):
-          If value type is Lisp_Some_Buffer_Local_Value,
-          change it to Lisp_Buffer_Local_Value permanently.
+        If value type is Lisp_Some_Buffer_Local_Value,
+        change it to Lisp_Buffer_Local_Value permanently.
         * undo.c (record_block): Delete unused cp =.
-          Don't bother reallocing if n = 0 after first batch.
+        Don't bother reallocing if n = 0 after first batch.
         * fileio.c (Fverify_visited_file_modtime):
-          If CHECK_BUFFER changes buf, use the changed value.
+        If CHECK_BUFFER changes buf, use the changed value.
 
 1986-07-07  Richard M. Stallman  (rms@prep)
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fbe3f752aed..241019b51c7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -14197,7 +14197,7 @@
 1989-12-14  Joseph Arceneaux  (jla@spiff)
 
         * xfns.c: New variable Vx_no_window_manager.
-         (Fx_track_pointer): If bufp < 0, abort.
+        (Fx_track_pointer): If bufp < 0, abort.
 
         * xterm.c (XTread_socket): When leaving window, set x_mouse_x and
         x_mouse_y to -1.
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index 7e5728fbbcd..c853ad7b4a6 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -4329,7 +4329,7 @@
 
 1993-11-01  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
-        * s/sunos4-1-3.h (HAVE_TERMIOS): Defined.
+        * s/sunos4-1-3.h (HAVE_TERMIOS): Define.
 
 1993-10-25  Brian J. Fox  (bfox@albert.gnu.ai.mit.edu)
 
@@ -4411,7 +4411,7 @@
 
         * keyboard.c (read_key_sequence): Don't declare first_event; it is
         no longer used.  Change "#if 0" for first_event reading to
-         "#if defined (GOBBLE_FIRST_EVENT)".
+        "#if defined (GOBBLE_FIRST_EVENT)".
 
 1993-10-03  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -4426,9 +4426,9 @@
 
         * Makefile.in: File removed.  It is now generated by ../configure.
 
-        * Makefile.in.in (LIBES): Add $(GNULIB_VAR) again at end.  This
-        change to ymakefile was mysteriously lost.  Were any others lost
-        too?
+        * Makefile.in.in (LIBES): Add $(GNULIB_VAR) again at end.
+        This change to ymakefile was mysteriously lost.
+        Were any others lost too?
 
 1993-10-02  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -4461,8 +4461,7 @@
 
 1993-09-24  Brian J. Fox  (bfox@ai.mit.edu)
 
-        * textprop.c (validate_plist): Add declaration for `list'
-        argument.
+        * textprop.c (validate_plist): Add declaration for `list' argument.
 
         * frame.c (Fhandle_switch_frame): Doc fix.
 
@@ -4501,7 +4500,7 @@
         * doc.c (Fsubstitute_command_keys): Pass new arg.
         * abbrev.c (Funexpand_abbrev, Fexpand_abbrev): Pass new arg.
 
-        * s/aix3-2.h (AIX3_2): Defined.
+        * s/aix3-2.h (AIX3_2): Define.
         * m/ibmrs6000.h (LIBS_MACHINE): Include -lrts, -liconv only if AIX3_2.
 
         * xterm.h (HAVE_X11R4): If AIX, do not define HAVE_X11R4.
@@ -4703,13 +4702,13 @@
 
         * xfns.c (XScreenNumberOfScreen): New function.
 
-        * m/tek4300.h (C_DEBUG_SWITCH, SYSTEM_MALLOC): Defined.
+        * m/tek4300.h (C_DEBUG_SWITCH, SYSTEM_MALLOC): Define.
 
         * m/iris4d.h (START_FILES, LIB_STANDARD): Don't define if USG5_4.
         (DEFAULT_ENTRY_ADDRESS): Likewise.
         (UNEXEC): Use unexelfsgi.o if USG5_4.
 
-        * s/irix5-0.h (C_SWITCH_MACHINE): Deleted.
+        * s/irix5-0.h (C_SWITCH_MACHINE): Delete.
 
 1993-08-13  Frederic Pierresteguy  (F.Pierresteguy@frcl.bull.fr)
 
@@ -4809,7 +4808,7 @@
 
         * m/dpx2.h (HAVE_TCATTR): Macro #defined.
         (HAVE_CLOSEDIR): #undef to allow use of closedir in sysdep.c.
-        (SIGTSTP): Commented #undef to allow use of ^Z in shell-mode.
+        (SIGTSTP): Comment #undef to allow use of ^Z in shell-mode.
         (SIGNALS_VIA_CHARACTERS): #defined.
 
 1993-08-09  Paul Eggert  (eggert@twinsun.com)
@@ -4849,10 +4848,10 @@
         and calculate position properly.
 
         * s/bsd4-2.h, s/bsd4-3.h, s/umax.h, s/rtu.h, s/dgux.h (HAVE_VFORK):
-        Defined.
+        Define.
 
         * ymakefile (alloc.o): Don't use DEBUG_MOLE.
-        (DEBUG_MOLE): Deleted.
+        (DEBUG_MOLE): Delete.
         * gnu-hp300: File deleted.
 
         * .gdbinit: Don't put -q in args.
@@ -4878,7 +4877,7 @@
         (main): Call init_buffer, init_callproc and init_cmdargs
         before init_lread.
         (syms_of_emacs): Install the function, and protect the variable.
-        * lisp.h (Vinvocation_directory): Declared.
+        * lisp.h (Vinvocation_directory): Declare.
         * lread.c (init_lread): Normally put Vinvocation_directory
         at end of Vload_path, if not present already.
 
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index d30bd1bdb00..e4991971461 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -6107,7 +6107,7 @@
         * fileio.c (Fmake_symbolic_link, Ffile_accessible_directory_p,
         Finsert_file_contents, auto_save_error, Fwrite_region): Likewise.
         (Fcopy_file, build_annotations, Fdo_auto_save): Delete unused
-         variables.
+        variables.
 
 1994-08-23  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b161a21eb72..6e53a39ac93 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -3913,7 +3913,7 @@
 2001-01-05  Gerd Moellmann  <gerd@gnu.org>
 
         * sysdep.c: Don't prototype srandom; it takes an unsigned argument
-         on some systems, and an unsigned long on others, like FreeBSD 4.1.
+        on some systems, and an unsigned long on others, like FreeBSD 4.1.
 
 2001-01-04  Gerd Moellmann  <gerd@gnu.org>
 
@@ -5161,9 +5161,9 @@
         `vertical-line', `mode-line' and `header-line' events.
 
         * xdisp.c (try_window_id): Avoid starting to display in the middle
-         of a character, a TAB for instance.  This is easier than to set
-         up the iterator exactly, and it's not a frequent case, so the
-         additional effort wouldn't really pay off.
+        of a character, a TAB for instance.  This is easier than to set
+        up the iterator exactly, and it's not a frequent case, so the
+        additional effort wouldn't really pay off.
 
 2000-11-26  Andrew Choi  <akochoi@i-cable.com>
 
@@ -5196,9 +5196,9 @@
 2000-11-24  Gerd Moellmann  <gerd@gnu.org>
 
         * xdisp.c (init_from_display_pos): If POS says we're already after
-         an overlay string ending at POS, make sure to pop the iterator
-         because it will be in front of that overlay string.  When POS is
-         ZV, we've thereby also ``processed'' overlay strings at ZV.
+        an overlay string ending at POS, make sure to pop the iterator
+        because it will be in front of that overlay string.  When POS is
+        ZV, we've thereby also ``processed'' overlay strings at ZV.
 
         * xfaces.c (lface_from_face_name): Function comment fix.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index dada7164761..2719f3a232a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
 
 # Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-#               2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#               Free Software Foundation, Inc.
+#   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -38,11 +38,9 @@ srcdir = @srcdir@
 abs_builddir = @abs_builddir@
 VPATH = $(srcdir)
 CC = @CC@
-CPP = @CPP@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LN_S = @LN_S@
 EXEEXT = @EXEEXT@
 version = @version@
 # Substitute an assignment for the MAKE variable, because
@@ -69,43 +67,120 @@ bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}
 
 OTHER_FILES = @OTHER_FILES@
 
+CRT_DIR=@CRT_DIR@
+
+## Machine-specific CFLAGS.
+C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
+## System-specific CFLAGS.
+C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
+## This holds any special options for linking temacs only (ie, not
+## used by configure).  Not used elsewhere because it sometimes
+## contains options that have to do with using Emacs's crt0, 
+## which are only good with temacs.
+LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
+## Next two must come before LD_SWITCH_SYSTEM.
+## If needed, a -R option that says where to find X windows at run time.
+LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@
+## As above, but using -rpath instead.
+LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@
+## System-specific LDFLAGS.
+LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@
+LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@
+## Flags to pass to ld only for temacs.
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS)
+
+## Some systems define this to request special libraries.
+LIBS_SYSTEM=@LIBS_SYSTEM@
+
+## Where to find libgcc.a, if using gcc and necessary.
+LIB_GCC=@LIB_GCC@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
 LIBGIF=@LIBGIF@
 LIBXPM=@LIBXPM@
 XFT_LIBS=@XFT_LIBS@
-
-C_SWITCH_SYSTEM=@c_switch_system@
-C_SWITCH_MACHINE=@c_switch_machine@
-
-C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
+LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS)
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
+DBUS_OBJ = @DBUS_OBJ@
 
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
 
+GTK_OBJ=@GTK_OBJ@
+
+## -ltermcap, or -lncurses, or -lcurses, or "".
+LIBS_TERMCAP=@LIBS_TERMCAP@
+## terminfo.o if TERMINFO, else tparam.o.
+TERMCAP_OBJ=@TERMCAP_OBJ@
+
+LIBXMU=@LIBXMU@
+
+LIBXSM=@LIBXSM@
+
+LIBXTR6=@LIBXTR6@
+
+## $(LIBXMU) -lXt $(LIBXTR6) -lXext if USE_X_TOOLKIT, else $(LIBXSM).
+## Only used if HAVE_X_WINDOWS.
+LIBXT_OTHER=@LIBXT_OTHER@
+
+XMENU_OBJ=@XMENU_OBJ@
+XOBJ=@XOBJ@
+
+TOOLKIT_LIBW=@TOOLKIT_LIBW@
+
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
 
 RSVG_LIBS= @RSVG_LIBS@
 RSVG_CFLAGS= @RSVG_CFLAGS@
 
+IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
+IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
+
+
+## widget.o if USE_X_TOOLKIT, otherwise empty.
+WIDGET_OBJ=@WIDGET_OBJ@
+
+## sheap.o if CYGWIN, otherwise empty.
+CYGWIN_OBJ=@CYGWIN_OBJ@
+
+NS_OBJ=@NS_OBJ@
+NS_SUPPORT=@NS_SUPPORT@
+
+## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
+FONT_OBJ=@FONT_OBJ@
+
+## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
+## Not used if HAVE_MOUSE.
+GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@
+
+BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \
+  ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
+  ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
+
+X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \
+  ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc
+
+LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
+
 INTERVALS_H = dispextern.h intervals.h composite.h
 
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 
 RUN_TEMACS = `/bin/pwd`/temacs
 
+START_FILES = @START_FILES@
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
 /* just to be sure the sh is used */
 SHELL=/bin/sh
 
-#define THIS_IS_MAKEFILE
 #define NOT_C_CODE
 #include "config.h"
 
@@ -113,11 +188,6 @@ SHELL=/bin/sh
 DEPFLAGS = -MMD -MF deps/$*.d
 #endif
 
-/* Undefine until the user can be moved in the non-cpp section. */
-#undef C_SWITCH_SYSTEM
-#undef C_SWITCH_MACHINE
-#undef C_SWITCH_X_SITE
-
 /* Do not let the file name mktime.c get messed up.  */
 #ifdef mktime
 #undef mktime
@@ -136,101 +206,11 @@ DEPFLAGS = -MMD -MF deps/$*.d
    do not let it interfere with this file.  */
 #undef register
 
-/* Some machines do not find the standard C libraries in the usual place.  */
-#ifndef ORDINARY_LINK
-#ifndef LIB_STANDARD
-#define LIB_STANDARD -lc
-#endif
-#else
-#ifndef LIB_STANDARD
-#define LIB_STANDARD
-#endif
-#endif
-
-/* Under GNUstep, putting libc on the link line causes problems. */
-#ifdef NS_IMPL_GNUSTEP
-#undef LIB_STANDARD
-#define LIB_STANDARD
-#endif
-
-/* Some s/SYSTEM.h files define this to request special libraries.  */
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-
-/* Some m/MACHINE.h files define this to request special libraries.  */
-#ifndef LIBS_MACHINE
-#define LIBS_MACHINE
-#endif
-
-#ifndef LIB_MATH
-#  define LIB_MATH -lm
-#endif /* LIB_MATH */
-
-/* Some s/SYSTEM.h files define this to request special switches in ld.  */
-#ifndef LD_SWITCH_SYSTEM
-#if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
-#define LD_SWITCH_SYSTEM -X
-#else /* (defined (BSD_SYSTEM) && !defined (COFF)) */
-#define LD_SWITCH_SYSTEM
-#endif /* (defined (BSD_SYSTEM) && !defined (COFF)) */
-#endif /* LD_SWITCH_SYSTEM */
-
-/* This holds special options for linking temacs
-   that should be used for linking anything else.  */
-#ifndef LD_SWITCH_SYSTEM_TEMACS
-#define LD_SWITCH_SYSTEM_TEMACS
-#endif
-
-/* Some m/MACHINE.h files define this to request special switches in ld.  */
-#ifndef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE
-#endif
-
-/* This holds special options for linking temacs
-   that should be used for linking anything else.  */
-#ifndef LD_SWITCH_MACHINE_TEMACS
-#define LD_SWITCH_MACHINE_TEMACS
-#endif
-
-/* These macros are for switches specifically related to X Windows.  */
-#ifndef C_SWITCH_X_MACHINE
-#define C_SWITCH_X_MACHINE
-#endif
-
-#ifndef C_SWITCH_X_SYSTEM
-#define C_SWITCH_X_SYSTEM
-#endif
-
+/* This macro is for switches specifically related to X Windows.  */
 #ifndef LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE
 #endif
 
-#ifndef LD_SWITCH_X_DEFAULT
-#define LD_SWITCH_X_DEFAULT
-#endif
-
-#ifndef ORDINARY_LINK
-
-#ifndef START_FILES
-#ifdef NO_REMAP
-#define START_FILES pre-crt0.o /lib/crt0.o
-#else /* ! defined (NO_REMAP) */
-#define START_FILES ecrt0.o
-#endif /* ! defined (NO_REMAP) */
-#endif /* START_FILES */
-STARTFILES = START_FILES
-
-#else /* ORDINARY_LINK */
-
-/* config.h might want to force START_FILES anyway */
-#ifdef START_FILES
-STARTFILES = START_FILES
-#endif /* START_FILES */
-
-#endif /* not ORDINARY_LINK */
-
-
 #ifdef NS_IMPL_GNUSTEP
 /* Pull in stuff from GNUstep-make. */
 FOUNDATION_LIB=gnu
@@ -240,10 +220,6 @@ include @GNUSTEP_MAKEFILES@/Additional/gui.make
 shared=no
 #endif
 
-#ifdef HAVE_DBUS
-DBUS_OBJ = dbusbind.o
-#endif
-
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified
    at initial startup, then labeled as part of the text area when
@@ -255,13 +231,10 @@ DBUS_OBJ = dbusbind.o
    -DHAVE_CONFIG_H is needed for some other files to take advantage of
    the information in ``config.h''.  */
 
-#undef C_SWITCH_MACHINE
-#undef C_SWITCH_SYSTEM
-#undef C_SWITCH_X_SITE
-
-/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
+/* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
+/* MYCPPFLAGS only referenced in etc/DEBUG.  */
+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}  ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 
 .SUFFIXES: .m
@@ -276,117 +249,38 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 #endif
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
-#ifndef LIB_X11_LIB
-#define LIB_X11_LIB -lX11
-#endif
-
 #ifdef HAVE_X_WINDOWS
-XMENU_OBJ = xmenu.o
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o \
-      xsettings.o xgselect.o
-
+/* This test needs to say in cpp for the time being, since s/msdos.h
+   defines HAVE_MENUS, and does not use the configure script.  */
 #ifdef HAVE_MENUS
-
-#ifdef USE_GTK
-GTK_OBJ= gtkutil.o
-#endif
-
-/* The X Menu stuff is present in the X10 distribution, but missing
-   from X11.  If we have X10, just use the installed library;
-   otherwise, use our own copy.  */
-#ifdef HAVE_X11
-#ifdef USE_X_TOOLKIT
-OLDXMENU=${lwlibdir}liblw.a
-LIBXMENU= $(OLDXMENU)
-#else /* not USE_X_TOOLKIT */
-OLDXMENU= ${oldXMenudir}libXMenu11.a
-LIBXMENU= $(OLDXMENU)
-#endif /* not USE_X_TOOLKIT */
-#else /* not HAVE_X11 */
-LIBXMENU= -lXMenu
-#endif /* not HAVE_X11 */
-
+OLDXMENU=@OLDXMENU@
+LIBXMENU=@LIBXMENU@
 #else /* not HAVE_MENUS */
-
-/* Otherwise, do not worry about the menu library at all.  */
-LIBXMENU=
-#endif /* not HAVE_MENUS */
-
-#ifdef USE_X_TOOLKIT
-# define @X_TOOLKIT_TYPE@
-# if HAVE_XAW3D
-LUCID_LIBW= -lXaw3d
-# else
-LUCID_LIBW= -lXaw
-# endif
-# if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
-#  define LIB_MOTIF_EXTRA -lXp
-# else
-#  define LIB_MOTIF_EXTRA
-# endif
-# ifdef LIB_MOTIF
-MOTIF_LIBW= LIB_MOTIF LIB_MOTIF_EXTRA
-# else
-MOTIF_LIBW= -lXm LIB_MOTIF_EXTRA
-# endif
-LIBW=$(@X_TOOLKIT_TYPE@_LIBW)
-
-#ifdef HAVE_X11XTR6
-#ifdef NEED_LIBW
-LIBXTR6 = -lSM -lICE -lw
-#else
-LIBXTR6 = -lSM -lICE
-#endif
-#endif
-
-#ifndef LIBXMU
-#define LIBXMU -lXmu
-#endif
-
-LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext
-
-#else /* not USE_X_TOOLKIT */
-
-#ifdef USE_GTK
-LIBW=@GTK_LIBS@
 OLDXMENU=
 LIBXMENU=
-#endif /* USE_GTK */
-
-#ifdef HAVE_X_SM
-LIBXT=$(LIBW) -lSM -lICE
-#else
-LIBXT=$(LIBW)
-#endif
-#endif /* not USE_X_TOOLKIT */
+#endif /* not HAVE_MENUS */
 
-#ifdef HAVE_X11
-/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
-   options for where to find X libraries, but before those libraries.  */
-X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS)
-#else /* not HAVE_X11 */
-LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
-#endif /* not HAVE_X11 */
+LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
+LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE
+LIBX_OTHER=@LIBX_OTHER@
 #endif /* not HAVE_X_WINDOWS */
 
-LIBSOUND= @LIBSOUND@
-CFLAGS_SOUND= @CFLAGS_SOUND@
 
-RSVG_LIBS= @RSVG_LIBS@
-RSVG_CFLAGS= @RSVG_CFLAGS@
+/* A macro which other sections of Makefile can redefine to munge the
+   flags before they are passed to LD.  This is helpful if you have
+   redefined LD to something odd, like "gcc".
+   (The YMF prefix is a holdover from the old name "ymakefile".)  */
+#define YMF_PASS_LDFLAGS(flags) flags
 
-IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
-IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
 
-#ifndef ORDINARY_LINK
-/* Fix linking if compiled with GCC.  */
-#ifdef __GNUC__
+#ifdef ORDINARY_LINK
+LD = $(CC)
 
-#ifdef LINKER
-#define LINKER_WAS_SPECIFIED
-#endif
+#else /* not ORDINARY_LINK */
+GNULIB_VAR = $(LIB_GCC)
 
+/* Fix linking if compiled with GCC.  */
+#if defined (__GNUC__) && ! defined (LINKER)
 /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
    places that are difficult to figure out at make time.  Fortunately,
    these same versions allow you to pass arbitrary flags on to the
@@ -395,90 +289,42 @@ IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
    Well, it is not quite perfect.  The "-nostdlib" keeps GCC from
    searching for libraries in its internal directories, so we have to
    ask GCC explicitly where to find libgcc.a.  */
-
-#ifndef LINKER
 #define LINKER $(CC) -nostdlib
-#endif
-
-#ifndef LIB_GCC
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) -print-libgcc-file-name`
-#endif /* not LIB_GCC */
-
-GNULIB_VAR = LIB_GCC
-
-#ifndef LINKER_WAS_SPECIFIED
-/* GCC passes any argument prefixed with -Xlinker directly to the
-   linker.  See prefix-args.c for an explanation of why we do not do
-   this with the shell''s ``for'' construct.
-   Note that some people do not have '.'  in their paths, so we must
-   use ./prefix-args.  */
+/* GCC passes any argument prefixed with -Xlinker directly to the linker.
+   See prefix-args.c for an explanation of why we do not do this with the
+   shell''s ``for'' construct.  Note that sane people do not have '.' in
+   their paths, so we must use ./prefix-args.  */
+#undef YMF_PASS_LDFLAGS
 #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
-#else
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
-
-#else /* not __GNUC__ */
-GNULIB_VAR =
+#endif /* defined (__GNUC__) && ! defined (LINKER) */
 
-#endif /* not __GNUC__ */
-#endif /* not ORDINARY_LINK */
-
-#ifdef ORDINARY_LINK
-LD = $(CC)
-#else
 #ifdef LINKER
 LD=LINKER
 #else /* not LINKER */
 LD=ld
 #endif /* not LINKER */
+
 #endif /* not ORDINARY_LINK */
 
-/* Flags to pass to LD only for temacs.  */
-/* Do not split this line with a backslash.  That can cause trouble with
-   some cpps.  */
-TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS
-
-/* A macro which other sections of Makefile can redefine to munge the
-   flags before they are passed to LD.  This is helpful if you have
-   redefined LD to something odd, like "gcc".
-   (The YMF prefix is a holdover from the old name "ymakefile".)
-  */
-#ifndef YMF_PASS_LDFLAGS
-#define YMF_PASS_LDFLAGS(flags) flags
-#endif
 
 #ifdef MSDOS
 #ifdef HAVE_X_WINDOWS
-MSDOS_OBJ = dosfns.o msdos.o xmenu.o
+MSDOS_OBJ = dosfns.o msdos.o
 #else
-MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o termcap.o
+MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o
 #endif
 #endif
 
-#ifdef CYGWIN
-CYGWIN_OBJ = sheap.o
-#endif
-
 #ifdef HAVE_NS
 ns_appdir=@ns_appdir@/
 ns_appbindir=@ns_appbindir@/
 ns_appresdir=@ns_appresdir@/
 ns_appsrc=@ns_appsrc@
-/* Object files for NeXTstep */
-NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
-        fontset.o fringe.o image.o
 #endif  /* HAVE_NS */
 
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
-#if defined (HAVE_XFT)
-FONT_DRIVERS = xfont.o ftfont.o xftfont.o ftxfont.o
-#elif defined (HAVE_FREETYPE)
-FONT_DRIVERS = xfont.o ftfont.o ftxfont.o
-#else /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
-FONT_DRIVERS = xfont.o
-#endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
+FONT_DRIVERS=$(FONT_OBJ)
 #endif /* HAVE_X_WINDOWS */
 #endif /* HAVE_WINDOW_SYSTEM */
 
@@ -493,7 +339,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
         cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
         alloc.o data.o doc.o editfns.o callint.o \
         eval.o floatfns.o fns.o font.o print.o lread.o \
-        syntax.o UNEXEC bytecode.o \
+        syntax.o @unexec@ bytecode.o \
         process.o callproc.o \
         region-cache.o sound.o atimer.o \
         doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
@@ -509,24 +355,10 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
 
-
-#ifdef TERMINFO
-/* Used to be -ltermcap here.  If your machine needs that,
-   define LIBS_TERMCAP in the m/MACHINE.h file.  */
-#ifndef LIBS_TERMCAP
-#define LIBS_TERMCAP -lcurses
-#endif /* LIBS_TERMCAP */
-termcapobj = terminfo.o
-#else /* ! defined (TERMINFO) */
-#ifndef LIBS_TERMCAP
-#define LIBS_TERMCAP
-#endif /* LIBS_TERMCAP */
-termcapobj = tparam.o
-#endif /* ! defined (TERMINFO) */
-
-
+gmallocobj =
+rallocobj =
+vmlimitobj =
 #ifndef SYSTEM_MALLOC
-
 #ifndef DOUG_LEA_MALLOC
 gmallocobj = gmalloc.o
 #endif
@@ -535,36 +367,23 @@ gmallocobj = gmalloc.o
 rallocobj = ralloc.o
 #endif
 
-mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
-
-#endif /* SYSTEM_MALLOC */
+vmlimitobj = vm-limit.o
+#endif /* !SYSTEM_MALLOC */
 
+/* Empty on Cygwin, lastfile.o elsewhere.  */
+PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
+/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.  */
+POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
-#ifdef USE_X_TOOLKIT
-widgetobj= widget.o
-#else /* not USE_X_TOOLKIT */
-widgetobj=
-#endif /* not USE_X_TOOLKIT */
-
-
-/* define otherobj as list of object files that make-docfile
-   should not be told about.  */
-#ifdef CYGWIN
-/* Cygwin differs because of its unexec(). */
-otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(widgetobj) $(LIBOBJS)
-#else
-otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS)
-#endif
+/* List of object files that make-docfile should not be told about.  */
+otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
+  $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 #ifdef HAVE_MOUSE
 #define MOUSE_SUPPORT ${lispsource}mouse.elc \
   ${lispsource}select.elc ${lispsource}scroll-bar.elc
 #else
-#ifdef HAVE_GPM
-#define MOUSE_SUPPORT ${lispsource}mouse.elc
-#else
-#define MOUSE_SUPPORT
-#endif
+#define MOUSE_SUPPORT $(GPM_MOUSE_SUPPORT)
 #endif
 
 #ifdef MSDOS
@@ -578,15 +397,9 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS)
 
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
-#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
- ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
- ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \
- ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc \
- ${lispsource}font-setting.elc
+#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)
 #else
-#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
- ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
- ${lispsource}tool-bar.elc ${lispsource}mwheel.elc
+#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT)
 #endif
 #else
 #define WINDOW_SUPPORT
@@ -607,13 +420,6 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS)
 #define TOOLTIP_SUPPORT
 #endif
 
-#ifdef HAVE_NS
-#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \
-  ${lispsource}term/ns-win.elc
-#else
-#define NS_SUPPORT
-#endif
-
 /* This is the platform-specific list of Lisp files loaded into the
    dumped Emacs.  It is arranged like this because it is easier to generate
    it semi-mechanically from loadup.el this way.
@@ -714,7 +520,7 @@ lisp= \
         MSDOS_SUPPORT \
         WINNT_SUPPORT \
         WINDOW_SUPPORT \
-        NS_SUPPORT \
+        ${NS_SUPPORT} \
         ${lispsource}widget.elc \
         ${lispsource}window.elc \
         ${lispsource}version.el
@@ -817,7 +623,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
   ../lisp/tooltip.elc ../lisp/image.elc \
   ../lisp/fringe.elc ../lisp/dnd.elc \
   ../lisp/mwheel.elc ../lisp/tool-bar.elc \
-  ../lisp/x-dnd.elc ../lisp/font-setting.elc \
+  ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \
   ../lisp/international/ccl.elc \
   ../lisp/international/fontset.elc \
   ../lisp/mouse.elc \
@@ -832,11 +638,11 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
    duplicated symbols.  If the standard libraries were compiled
    with GCC, we might need gnulib again after them.  */
 
-LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) ${IMAGEMAGICK_LIBS} $(DBUS_LIBS) \
-   @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
-   $(GETLOADAVG_LIBS) ${GCONF_LIBS} \
+LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
+   $(RSVG_LIBS) ${IMAGEMAGICK_LIBS}  $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ $(LIBS_SYSTEM) \
+   $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
-   $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
+   $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR)
 
 all: emacs${EXEEXT} $(OTHER_FILES)
 
@@ -877,7 +683,8 @@ ${libsrc}make-docfile${EXEEXT}:
 buildobj.h: Makefile
         echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
+/* FIXME LOCALCPP not defined or mentioned anywhere.  */
+temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
         $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
         -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \
@@ -885,13 +692,10 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
         ${obj} ${otherobj} ${LIBES}
 #else
         $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-    -o temacs ${STARTFILES} ${obj} ${otherobj}  \
+    -o temacs ${START_FILES} ${obj} ${otherobj}  \
     ${LIBES}
 #endif
 
-/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
-   often contain options that have to do with using Emacs''s crt0,
-   which are only good with temacs.  */
 prefix-args${EXEEXT}: prefix-args.o $(config_h)
         $(CC) $(LDFLAGS) prefix-args.o -o prefix-args
 
@@ -906,19 +710,12 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
 /* Supply an ordering for parallel make.  */
 ../src/$(OLDXMENU): ${OLDXMENU}
 
-/* Encode the values of these two macros in Make variables,
-   so we can use $(...) to substitute their values within "...".  */
-C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
-C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
-
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
 
 really-lwlib:
         cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
-    CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
-    "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
-    "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
+    CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
         @true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
 #else /* not USE_X_TOOLKIT */
@@ -926,9 +723,7 @@ $(OLDXMENU): really-oldXMenu
 
 really-oldXMenu:
         cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
-    CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
-    "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
-    "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
+    CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
         @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
 #endif /* not USE_X_TOOLKIT */
@@ -958,6 +753,14 @@ doc.o: buildobj.h
 
 #ifndef AUTO_DEPEND
 
+/* FIXME some of these dependencies are platform-specific.
+Eg callproc.c only depends on w32.h for WINDOWSNT builds.
+One way to fix this would be to replace w32.h (etc) by $(W32_H),
+a variable set by configure.  Does not seem worth the trouble.
+
+nsgui.h: In fact, every .o file depends directly or indirectly on
+dispextern.h and hence nsgui.h under NS.  But the ones that actually
+use stuff there are more limited.  */
 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \
  $(config_h)
 bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h $(config_h)
@@ -993,7 +796,7 @@ dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \
    coding.h regex.h systime.h blockinput.h atimer.h composite.h
 dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \
    window.h buffer.h termchar.h termopts.h termhooks.h cm.h \
-   disptab.h indent.h $(INTERVALS_H) \
+   disptab.h indent.h $(INTERVALS_H) nsgui.h \
    xterm.h blockinput.h atimer.h character.h msdos.h keyboard.h \
    syssignal.h lisp.h $(config_h)
 doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h \
@@ -1014,18 +817,19 @@ filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \
 filemode.o: filemode.c $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h    \
-   msdos.h dosfns.h dispextern.h w32term.h termchar.h coding.h composite.h \
-   lisp.h $(config_h) termhooks.h ccl.h
-fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h \
+   msdos.h dosfns.h dispextern.h w32term.h nsgui.h termchar.h coding.h \
+   composite.h lisp.h $(config_h) termhooks.h ccl.h
+fringe.o: fringe.c dispextern.h nsgui.h frame.h window.h buffer.h termhooks.h \
    blockinput.h atimer.h systime.h lisp.h $(config_h)
 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
-   font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h
+   font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h nsgui.h
 ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \
    lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h fontset.h \
    ccl.h ftfont.h
 fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \
    charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \
-   blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) window.h xterm.h
+   blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) nsgui.h \
+   window.h xterm.h
 getloadavg.o: getloadavg.c $(config_h)
 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \
   blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \
@@ -1041,7 +845,7 @@ insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
    systime.h syntax.h $(INTERVALS_H) blockinput.h atimer.h composite.h \
-   xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h coding.h \
+   xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h nsgui.h coding.h \
    lisp.h $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    atimer.h systime.h puresize.h character.h charset.h $(INTERVALS_H) keymap.h window.h \
@@ -1062,7 +866,7 @@ msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
    keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h lisp.h $(config_h)
 nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \
-  dispextern.h nsgui.h fontset.h $(INTERVALS_H) keyboard.h blockinput.h \
+  dispextern.h fontset.h $(INTERVALS_H) keyboard.h blockinput.h \
   atimer.h systime.h epaths.h termhooks.h coding.h systime.h lisp.h $(config_h)
 nsfont.o: nsterm.h dispextern.h frame.h lisp.h lisp.h $(config_h)
 nsimage.o: nsimage.m nsterm.h lisp.h $(config_h)
@@ -1120,16 +924,16 @@ widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
    disptab.h keyboard.h msdos.h coding.h termhooks.h \
    keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \
-   xterm.h w32term.h nsterm.h lisp.h $(config_h)
+   xterm.h w32term.h nsterm.h nsgui.h lisp.h $(config_h)
 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
-   coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h     \
-   charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h xterm.h    \
-   w32term.h nsterm.h msdos.h composite.h fontset.h ccl.h \
+   coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \
+   charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h \
+   xterm.h w32term.h nsterm.h nsgui.h msdos.h composite.h fontset.h ccl.h \
    blockinput.h atimer.h systime.h keymap.h font.h
 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h   \
    window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
    systime.h keyboard.h fontset.h w32term.h nsterm.h coding.h ccl.h \
-   $(INTERVALS_H) termchar.h termhooks.h font.h lisp.h $(config_h)
+   $(INTERVALS_H) nsgui.h termchar.h termhooks.h font.h lisp.h $(config_h)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
    character.h charset.h coding.h gtkutil.h lisp.h $(config_h) termhooks.h \
@@ -1142,7 +946,7 @@ ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
    font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h
 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \
    dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \
-   lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h
+   lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h nsgui.h
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
    charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
    systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \
@@ -1200,12 +1004,6 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \
    select which of these should be compiled.  */
 
 #ifdef HAVE_NS
-/* In fact, every .o file depends directly or indirectly on dispextern.h
-   and hence nsgui.h under NS.  But the ones that actually use stuff there
-   are more limited.  */
-dispnew.o font.o fontset.o frame.o fringe.o image.o keyboard.o menu.o \
-   window.o xdisp.o xfaces.o: nsgui.h
-
 ${ns_appdir}: ${ns_appsrc}
         rm -fr ${ns_appdir}
         mkdir -p ${ns_appdir}
@@ -1331,6 +1129,6 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
         cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}
 
 #ifdef AUTO_DEPEND
-ALLOBJS=$(STARTFILES) ${obj} ${otherobj} prefix-args.o
+ALLOBJS=$(START_FILES) ${obj} ${otherobj} prefix-args.o
 -include $(ALLOBJS:%.o=deps/%.d)
 #endif
diff --git a/src/alloc.c b/src/alloc.c
index 98d60067f9e..c1f1094d15f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1365,7 +1365,7 @@ uninterrupt_malloc ()
   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init (&alloc_mutex, &attr);
 #else  /* !DOUG_LEA_MALLOC */
-  /* Some systems such as Solaris 2.6 doesn't have a recursive mutex,
+  /* Some systems such as Solaris 2.6 don't have a recursive mutex,
      and the bundled gmalloc.c doesn't require it.  */
   pthread_mutex_init (&alloc_mutex, NULL);
 #endif /* !DOUG_LEA_MALLOC */
@@ -3193,13 +3193,13 @@ Its value and function definition are void, and its property list is nil.  */)
   p = XSYMBOL (val);
   p->xname = name;
   p->plist = Qnil;
-  p->value = Qunbound;
+  p->redirect = SYMBOL_PLAINVAL;
+  SET_SYMBOL_VAL (p, Qunbound);
   p->function = Qunbound;
   p->next = NULL;
   p->gcmarkbit = 0;
   p->interned = SYMBOL_UNINTERNED;
   p->constant = 0;
-  p->indirect_variable = 0;
   consing_since_gc += sizeof (struct Lisp_Symbol);
   symbols_consed++;
   return val;
@@ -4893,14 +4893,21 @@ Does not copy symbols.  Copies strings without text properties.  */)
   if (PURE_POINTER_P (XPNTR (obj)))
     return obj;
 
+  if (HASH_TABLE_P (Vpurify_flag)) /* Hash consing.  */
+    {
+      Lisp_Object tmp = Fgethash (obj, Vpurify_flag, Qnil);
+      if (!NILP (tmp))
+        return tmp;
+    }
+
   if (CONSP (obj))
-    return pure_cons (XCAR (obj), XCDR (obj));
+    obj = pure_cons (XCAR (obj), XCDR (obj));
   else if (FLOATP (obj))
-    return make_pure_float (XFLOAT_DATA (obj));
+    obj = make_pure_float (XFLOAT_DATA (obj));
   else if (STRINGP (obj))
-    return make_pure_string (SDATA (obj), SCHARS (obj),
-                             SBYTES (obj),
-                             STRING_MULTIBYTE (obj));
+    obj = make_pure_string (SDATA (obj), SCHARS (obj),
+                            SBYTES (obj),
+                            STRING_MULTIBYTE (obj));
   else if (COMPILEDP (obj) || VECTORP (obj))
     {
       register struct Lisp_Vector *vec;
@@ -4920,10 +4927,15 @@ Does not copy symbols.  Copies strings without text properties.  */)
         }
       else
         XSETVECTOR (obj, vec);
-      return obj;
     }
   else if (MARKERP (obj))
     error ("Attempt to copy a marker to pure storage");
+  else
+    /* Not purified, don't hash-cons.  */
+    return obj;
+
+  if (HASH_TABLE_P (Vpurify_flag)) /* Hash consing.  */
+    Fputhash (obj, obj, Vpurify_flag);
 
   return obj;
 }
@@ -5569,17 +5581,42 @@ mark_object (arg)
           break;
         CHECK_ALLOCATED_AND_LIVE (live_symbol_p);
         ptr->gcmarkbit = 1;
-        mark_object (ptr->value);
         mark_object (ptr->function);
         mark_object (ptr->plist);
-
+        switch (ptr->redirect)
+          {
+          case SYMBOL_PLAINVAL: mark_object (SYMBOL_VAL (ptr)); break;
+          case SYMBOL_VARALIAS:
+            {
+              Lisp_Object tem;
+              XSETSYMBOL (tem, SYMBOL_ALIAS (ptr));
+              mark_object (tem);
+              break;
+            }
+          case SYMBOL_LOCALIZED:
+            {
+              struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr);
+              /* If the value is forwarded to a buffer or keyboard field,
+                 these are marked when we see the corresponding object.
+                 And if it's forwarded to a C variable, either it's not
+                 a Lisp_Object var, or it's staticpro'd already.  */
+              mark_object (blv->where);
+              mark_object (blv->valcell);
+              mark_object (blv->defcell);
+              break;
+            }
+          case SYMBOL_FORWARDED:
+            /* If the value is forwarded to a buffer or keyboard field,
+               these are marked when we see the corresponding object.
+               And if it's forwarded to a C variable, either it's not
+               a Lisp_Object var, or it's staticpro'd already.  */
+            break;
+          default: abort ();
+          }
         if (!PURE_POINTER_P (XSTRING (ptr->xname)))
           MARK_STRING (XSTRING (ptr->xname));
         MARK_INTERVAL_TREE (STRING_INTERVALS (ptr->xname));
 
-        /* Note that we do not mark the obarray of the symbol.
-           It is safe not to do so because nothing accesses that
-           slot except to check whether it is nil.  */
         ptr = ptr->next;
         if (ptr)
           {
@@ -5598,22 +5635,6 @@ mark_object (arg)
 
       switch (XMISCTYPE (obj))
         {
-        case Lisp_Misc_Buffer_Local_Value:
-          {
-            register struct Lisp_Buffer_Local_Value *ptr
-              = XBUFFER_LOCAL_VALUE (obj);
-            /* If the cdr is nil, avoid recursion for the car.  */
-            if (EQ (ptr->cdr, Qnil))
-              {
-                obj = ptr->realvalue;
-                goto loop;
-              }
-            mark_object (ptr->realvalue);
-            mark_object (ptr->buffer);
-            mark_object (ptr->frame);
-            obj = ptr->cdr;
-            goto loop;
-          }
 
         case Lisp_Misc_Marker:
           /* DO NOT mark thru the marker's chain.
@@ -5621,17 +5642,6 @@ mark_object (arg)
              instead, markers are removed from the chain when freed by gc.  */
           break;
 
-        case Lisp_Misc_Intfwd:
-        case Lisp_Misc_Boolfwd:
-        case Lisp_Misc_Objfwd:
-        case Lisp_Misc_Buffer_Objfwd:
-        case Lisp_Misc_Kboard_Objfwd:
-          /* Don't bother with Lisp_Buffer_Objfwd,
-             since all markable slots in current buffer marked anyway.  */
-          /* Don't need to do Lisp_Objfwd, since the places they point
-             are protected with staticpro.  */
-          break;
-
         case Lisp_Misc_Save_Value:
 #if GC_MARK_STACK
           {
@@ -6036,6 +6046,8 @@ gc_sweep ()
 
             if (!sym->gcmarkbit && !pure_p)
               {
+                if (sym->redirect == SYMBOL_LOCALIZED)
+                  xfree (SYMBOL_BLV (sym));
                 sym->next = symbol_free_list;
                 symbol_free_list = sym;
 #if GC_MARK_STACK
@@ -6371,7 +6383,9 @@ If this portion is smaller than `gc-cons-threshold', this is ignored.  */);
 
   DEFVAR_LISP ("purify-flag", &Vpurify_flag,
                doc: /* Non-nil means loading Lisp code in order to dump an executable.
-This means that certain objects should be allocated in shared (pure) space.  */);
+This means that certain objects should be allocated in shared (pure) space.
+It can also be set to a hash-table, in which case this table is used to
+do hash-consing of the objects allocated to pure space.  */);
 
   DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages,
                doc: /* Non-nil means display messages at start and end of garbage collection.  */);
diff --git a/src/bidi.c b/src/bidi.c
index 0c8a3182510..d4c7d2451d7 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -23,7 +23,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    as per UAX#9, a part of the Unicode Standard.
 
    Unlike the reference and most other implementations, this one is
-   designed to be called once for every character in the buffer.
+   designed to be called once for every character in the buffer or
+   string.
 
    The main entry point is bidi_get_next_char_visually.  Each time it
    is called, it finds the next character in the visual order, and
@@ -34,6 +35,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    more details about its algorithm that finds the next visual-order
    character by resolving their levels on the fly.
 
+   The two other entry points are bidi_paragraph_init and
+   bidi_mirror_char.  The first determines the base direction of a
+   paragraph, while the second returns the mirrored version of its
+   argument character.
+
    If you want to understand the code, you will have to read it
    together with the relevant portions of UAX#9.  The comments include
    references to UAX#9 rules, for that very reason.
@@ -96,7 +102,7 @@ typedef enum {
 
 int bidi_ignore_explicit_marks_for_paragraph_level = 1;
 
-static Lisp_Object fallback_paragraph_start_re, fallback_paragraph_separate_re;
+static Lisp_Object paragraph_start_re, paragraph_separate_re;
 static Lisp_Object Qparagraph_start, Qparagraph_separate;
 
 static void
@@ -393,26 +399,24 @@ bidi_initialize ()
                           bidi_type[i].to ? bidi_type[i].to : bidi_type[i].from,
                           make_number (bidi_type[i].type));
 
-  fallback_paragraph_start_re =
-    XSYMBOL (Fintern_soft (build_string ("paragraph-start"), Qnil))->value;
-  if (!STRINGP (fallback_paragraph_start_re))
-    fallback_paragraph_start_re = build_string ("\f\\|[ \t]*$");
-  staticpro (&fallback_paragraph_start_re);
   Qparagraph_start = intern ("paragraph-start");
   staticpro (&Qparagraph_start);
-  fallback_paragraph_separate_re =
-    XSYMBOL (Fintern_soft (build_string ("paragraph-separate"), Qnil))->value;
-  if (!STRINGP (fallback_paragraph_separate_re))
-    fallback_paragraph_separate_re = build_string ("[ \t\f]*$");
-  staticpro (&fallback_paragraph_separate_re);
+  paragraph_start_re = Fsymbol_value (Qparagraph_start);
+  if (!STRINGP (paragraph_start_re))
+    paragraph_start_re = build_string ("\f\\|[ \t]*$");
+  staticpro (&paragraph_start_re);
   Qparagraph_separate = intern ("paragraph-separate");
   staticpro (&Qparagraph_separate);
+  paragraph_separate_re = Fsymbol_value (Qparagraph_separate);
+  if (!STRINGP (paragraph_separate_re))
+    paragraph_separate_re = build_string ("[ \t\f]*$");
+  staticpro (&paragraph_separate_re);
   bidi_initialized = 1;
 }
 
 /* Return the bidi type of a character CH, subject to the current
    directional OVERRIDE.  */
-bidi_type_t
+static INLINE bidi_type_t
 bidi_get_type (int ch, bidi_dir_t override)
 {
   bidi_type_t default_type;
@@ -463,7 +467,7 @@ bidi_check_type (bidi_type_t type)
 }
 
 /* Given a bidi TYPE of a character, return its category.  */
-bidi_category_t
+static INLINE bidi_category_t
 bidi_get_category (bidi_type_t type)
 {
   switch (type)
@@ -520,7 +524,7 @@ bidi_mirror_char (int c)
 
 /* Copy the bidi iterator from FROM to TO.  To save cycles, this only
    copies the part of the level stack that is actually in use.  */
-static inline void
+static INLINE void
 bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
 {
   int i;
@@ -540,14 +544,14 @@ static struct bidi_it bidi_cache[1000]; /* FIXME: make this dynamically allocate
 static int bidi_cache_idx;
 static int bidi_cache_last_idx;
 
-static inline void
+static INLINE void
 bidi_cache_reset (void)
 {
   bidi_cache_idx = 0;
   bidi_cache_last_idx = -1;
 }
 
-static inline void
+static INLINE void
 bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
 {
   int current_scan_dir = bidi_it->scan_dir;
@@ -564,7 +568,7 @@ bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
    level less or equal to LEVEL.  if LEVEL is -1, disregard the
    resolved levels in cached states.  DIR, if non-zero, means search
    in that direction from the last cache hit.  */
-static inline int
+static INLINE int
 bidi_cache_search (int charpos, int level, int dir)
 {
   int i, i_start;
@@ -655,7 +659,7 @@ bidi_cache_find_level_change (int level, int dir, int before)
   return -1;
 }
 
-static inline void
+static INLINE void
 bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
 {
   int idx;
@@ -710,7 +714,7 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
     bidi_cache_idx = idx + 1;
 }
 
-static inline bidi_type_t
+static INLINE bidi_type_t
 bidi_cache_find (int charpos, int level, struct bidi_it *bidi_it)
 {
   int i = bidi_cache_search (charpos, level, bidi_it->scan_dir);
@@ -730,7 +734,7 @@ bidi_cache_find (int charpos, int level, struct bidi_it *bidi_it)
   return UNKNOWN_BT;
 }
 
-static inline int
+static INLINE int
 bidi_peek_at_next_level (struct bidi_it *bidi_it)
 {
   if (bidi_cache_idx == 0 || bidi_cache_last_idx == -1)
@@ -743,19 +747,16 @@ bidi_peek_at_next_level (struct bidi_it *bidi_it)
    following the buffer position, -1 if position is at the beginning
    of a new paragraph, or -2 if position is neither at beginning nor
    at end of a paragraph.  */
-EMACS_INT
+static EMACS_INT
 bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos)
 {
-  Lisp_Object sep_re = Fbuffer_local_value (Qparagraph_separate,
-                                            Fcurrent_buffer ());
-  Lisp_Object start_re = Fbuffer_local_value (Qparagraph_start,
-                                              Fcurrent_buffer ());
+  /* FIXME: Why Fbuffer_local_value rather than just Fsymbol_value?  */
+  Lisp_Object sep_re;
+  Lisp_Object start_re;
   EMACS_INT val;
 
-  if (!STRINGP (sep_re))
-    sep_re = fallback_paragraph_separate_re;
-  if (!STRINGP (start_re))
-    start_re = fallback_paragraph_start_re;
+  sep_re = paragraph_separate_re;
+  start_re = paragraph_start_re;
 
   val = fast_looking_at (sep_re, charpos, bytepos, ZV, ZV_BYTE, Qnil);
   if (val < 0)
@@ -773,7 +774,7 @@ bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos)
    embedding levels on either side of the run boundary.  Also, update
    the saved info about previously seen characters, since that info is
    generally valid for a single level run.  */
-static inline void
+static INLINE void
 bidi_set_sor_type (struct bidi_it *bidi_it, int level_before, int level_after)
 {
   int higher_level = level_before > level_after ? level_before : level_after;
@@ -824,11 +825,9 @@ bidi_line_init (struct bidi_it *bidi_it)
 static EMACS_INT
 bidi_find_paragraph_start (EMACS_INT pos, EMACS_INT pos_byte)
 {
-  Lisp_Object re = Fbuffer_local_value (Qparagraph_start, Fcurrent_buffer ());
+  Lisp_Object re = paragraph_start_re;
   EMACS_INT limit = ZV, limit_byte = ZV_BYTE;
 
-  if (!STRINGP (re))
-    re = fallback_paragraph_start_re;
   while (pos_byte > BEGV_BYTE
          && fast_looking_at (re, pos, pos_byte, limit, limit_byte, Qnil) < 0)
     {
@@ -873,7 +872,6 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
       int ch, ch_len;
       EMACS_INT pos;
       bidi_type_t type;
-      EMACS_INT sep_len;
 
       /* If we are inside a paragraph separator, we are just waiting
          for the separator to be exhausted; use the previous paragraph
@@ -954,7 +952,7 @@ bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
 
 /* Do whatever UAX#9 clause X8 says should be done at paragraph's
    end.  */
-static inline void
+static INLINE void
 bidi_set_paragraph_end (struct bidi_it *bidi_it)
 {
   bidi_it->invalid_levels = 0;
@@ -976,10 +974,11 @@ bidi_init_it (EMACS_INT charpos, EMACS_INT bytepos, struct bidi_it *bidi_it)
   bidi_it->new_paragraph = 1;
   bidi_it->separator_limit = -1;
   bidi_it->type = NEUTRAL_B;
-  bidi_it->type_after_w1 = UNKNOWN_BT;
-  bidi_it->orig_type = UNKNOWN_BT;
+  bidi_it->type_after_w1 = NEUTRAL_B;
+  bidi_it->orig_type = NEUTRAL_B;
   bidi_it->prev_was_pdf = 0;
-  bidi_it->prev.type = bidi_it->prev.type_after_w1 = UNKNOWN_BT;
+  bidi_it->prev.type = bidi_it->prev.type_after_w1 =
+    bidi_it->prev.orig_type = UNKNOWN_BT;
   bidi_it->last_strong.type = bidi_it->last_strong.type_after_w1 =
     bidi_it->last_strong.orig_type = UNKNOWN_BT;
   bidi_it->next_for_neutral.charpos = -1;
@@ -995,7 +994,7 @@ bidi_init_it (EMACS_INT charpos, EMACS_INT bytepos, struct bidi_it *bidi_it)
 
 /* Push the current embedding level and override status; reset the
    current level to LEVEL and the current override status to OVERRIDE.  */
-static inline void
+static INLINE void
 bidi_push_embedding_level (struct bidi_it *bidi_it,
                            int level, bidi_dir_t override)
 {
@@ -1008,7 +1007,7 @@ bidi_push_embedding_level (struct bidi_it *bidi_it,
 
 /* Pop the embedding level and directional override status from the
    stack, and return the new level.  */
-static inline int
+static INLINE int
 bidi_pop_embedding_level (struct bidi_it *bidi_it)
 {
   /* UAX#9 says to ignore invalid PDFs.  */
@@ -1018,7 +1017,7 @@ bidi_pop_embedding_level (struct bidi_it *bidi_it)
 }
 
 /* Record in SAVED_INFO the information about the current character.  */
-static inline void
+static INLINE void
 bidi_remember_char (struct bidi_saved_info *saved_info,
                     struct bidi_it *bidi_it)
 {
@@ -1034,7 +1033,7 @@ bidi_remember_char (struct bidi_saved_info *saved_info,
 
 /* Resolve the type of a neutral character according to the type of
    surrounding strong text and the current embedding level.  */
-static inline bidi_type_t
+static INLINE bidi_type_t
 bidi_resolve_neutral_1 (bidi_type_t prev_type, bidi_type_t next_type, int lev)
 {
   /* N1: European and Arabic numbers are treated as though they were R.  */
@@ -1051,7 +1050,7 @@ bidi_resolve_neutral_1 (bidi_type_t prev_type, bidi_type_t next_type, int lev)
     return STRONG_R;
 }
 
-static inline int
+static INLINE int
 bidi_explicit_dir_char (int c)
 {
   /* FIXME: this should be replaced with a lookup table with suitable
@@ -1301,7 +1300,7 @@ bidi_resolve_explicit (struct bidi_it *bidi_it)
 
 /* Advance in the buffer, resolve weak types and return the type of
    the next character after weak type resolution.  */
-bidi_type_t
+static bidi_type_t
 bidi_resolve_weak (struct bidi_it *bidi_it)
 {
   bidi_type_t type;
@@ -1353,7 +1352,9 @@ bidi_resolve_weak (struct bidi_it *bidi_it)
              current level run, and thus not relevant to this NSM.
              This is why NSM gets the type_after_w1 of the previous
              character.  */
-          if (bidi_it->prev.type != UNKNOWN_BT)
+          if (bidi_it->prev.type_after_w1 != UNKNOWN_BT
+              /* if type_after_w1 is NEUTRAL_B, this NSM is at sor */
+              && bidi_it->prev.type_after_w1 != NEUTRAL_B)
             type = bidi_it->prev.type_after_w1;
           else if (bidi_it->sor == R2L)
             type = STRONG_R;
@@ -1490,7 +1491,7 @@ bidi_resolve_weak (struct bidi_it *bidi_it)
   return type;
 }
 
-bidi_type_t
+static bidi_type_t
 bidi_resolve_neutral (struct bidi_it *bidi_it)
 {
   int prev_level = bidi_it->level_stack[bidi_it->stack_idx].level;
@@ -1614,7 +1615,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
 /* Given an iterator state in BIDI_IT, advance one character position
    in the buffer to the next character (in the logical order), resolve
    the bidi type of that next character, and return that type.  */
-bidi_type_t
+static bidi_type_t
 bidi_type_of_next_char (struct bidi_it *bidi_it)
 {
   bidi_type_t type;
@@ -1640,7 +1641,7 @@ bidi_type_of_next_char (struct bidi_it *bidi_it)
    the buffer to the next character (in the logical order), resolve
    the embedding and implicit levels of that next character, and
    return the resulting level.  */
-int
+static int
 bidi_level_of_next_char (struct bidi_it *bidi_it)
 {
   bidi_type_t type;
diff --git a/src/buffer.c b/src/buffer.c
index 0759ce1c43c..339bc99dcb1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -78,9 +78,6 @@ static Lisp_Object Vbuffer_defaults;
    be a DEFVAR_PER_BUFFER for the slot, there is no default value for it;
    and the corresponding slot in buffer_defaults is not used.
 
-   If a slot is -2, then there is no DEFVAR_PER_BUFFER for it,
-   but there is a default value which is copied into each buffer.
-
    If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
    zero, that is a bug */
 
@@ -94,6 +91,12 @@ DECL_ALIGN (struct buffer, buffer_local_symbols);
 /* A Lisp_Object pointer to the above, used for staticpro */
 static Lisp_Object Vbuffer_local_symbols;
 
+/* Return the symbol of the per-buffer variable at offset OFFSET in
+   the buffer structure.  */
+
+#define PER_BUFFER_SYMBOL(OFFSET) \
+      (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_symbols))
+
 /* Flags indicating which built-in buffer-local variables
    are permanent locals.  */
 static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
@@ -507,7 +510,7 @@ clone_per_buffer_values (from, to)
         continue;
 
       obj = PER_BUFFER_VALUE (from, offset);
-      if (MARKERP (obj))
+      if (MARKERP (obj) && XMARKER (obj)->buffer == from)
         {
           struct Lisp_Marker *m = XMARKER (obj);
           obj = Fmake_marker ();
@@ -770,9 +773,7 @@ reset_buffer_local_variables (b, permanent_too)
     {
       Lisp_Object tmp, prop, last = Qnil;
       for (tmp = b->local_var_alist; CONSP (tmp); tmp = XCDR (tmp))
-        if (CONSP (XCAR (tmp))
-            && SYMBOLP (XCAR (XCAR (tmp)))
-            && !NILP (prop = Fget (XCAR (XCAR (tmp)), Qpermanent_local)))
+        if (!NILP (prop = Fget (XCAR (XCAR (tmp)), Qpermanent_local)))
           {
             /* If permanent-local, keep it.  */
             last = tmp;
@@ -822,9 +823,7 @@ reset_buffer_local_variables (b, permanent_too)
       int idx = PER_BUFFER_IDX (offset);
       if ((idx > 0
            && (permanent_too
-               || buffer_permanent_local_flags[idx] == 0))
-          /* Is -2 used anywhere?  */
-          || idx == -2)
+               || buffer_permanent_local_flags[idx] == 0)))
         PER_BUFFER_VALUE (b, offset) = PER_BUFFER_DEFAULT (offset);
     }
 }
@@ -938,59 +937,49 @@ is the default binding of the variable. */)
   CHECK_SYMBOL (variable);
   CHECK_BUFFER (buffer);
   buf = XBUFFER (buffer);
+  sym = XSYMBOL (variable);
 
-  sym = indirect_variable (XSYMBOL (variable));
-  XSETSYMBOL (variable, sym);
-
-  /* Look in local_var_list */
-  result = Fassoc (variable, buf->local_var_alist);
-  if (NILP (result))
+ start:
+  switch (sym->redirect)
     {
-      int offset, idx;
-      int found = 0;
-
-      /* Look in special slots */
-      /* 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);
-           /* sizeof EMACS_INT == sizeof Lisp_Object */
-           offset += (sizeof (EMACS_INT)))
-        {
-          idx = PER_BUFFER_IDX (offset);
-          if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
-              && SYMBOLP (PER_BUFFER_SYMBOL (offset))
-              && EQ (PER_BUFFER_SYMBOL (offset), variable))
-            {
-              result = PER_BUFFER_VALUE (buf, offset);
-              found = 1;
-              break;
-            }
-        }
-
-      if (!found)
-        result = Fdefault_value (variable);
-    }
-  else
-    {
-      Lisp_Object valcontents;
-      Lisp_Object current_alist_element;
-
-      /* What binding is loaded right now?  */
-      valcontents = sym->value;
-      current_alist_element
-        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
-
-      /* The value of the currently loaded binding is not
-         stored in it, but rather in the realvalue slot.
-         Store that value into the binding it belongs to
-         in case that is the one we are about to use.  */
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: result = SYMBOL_VAL (sym); break;
+    case SYMBOL_LOCALIZED:
+      { /* Look in local_var_alist.  */
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        XSETSYMBOL (variable, sym); /* Update In case of aliasing.  */
+        result = Fassoc (variable, buf->local_var_alist);
+        if (!NILP (result))
+          {
+            if (blv->fwd)
+              { /* What binding is loaded right now?  */
+                Lisp_Object current_alist_element = blv->valcell;
 
-      Fsetcdr (current_alist_element,
-               do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue));
+                /* The value of the currently loaded binding is not
+                   stored in it, but rather in the realvalue slot.
+                   Store that value into the binding it belongs to
+                   in case that is the one we are about to use.  */
 
-      /* Now get the (perhaps updated) value out of the binding.  */
-      result = XCDR (result);
+                XSETCDR (current_alist_element,
+                         do_symval_forwarding (blv->fwd));
+              }
+            /* Now get the (perhaps updated) value out of the binding.  */
+            result = XCDR (result);
+          }
+        else
+          result = Fdefault_value (variable);
+        break;
+      }
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *fwd = SYMBOL_FWD (sym);
+        if (BUFFER_OBJFWDP (fwd))
+          result = PER_BUFFER_VALUE (buf, XBUFFER_OBJFWD (fwd)->offset);
+        else
+          result = Fdefault_value (variable);
+        break;
+      }
+    default: abort ();
     }
 
   if (!EQ (result, Qunbound))
@@ -1025,12 +1014,7 @@ buffer_lisp_local_variables (buf)
       if (buf != current_buffer)
         val = XCDR (elt);
 
-      /* If symbol is unbound, put just the symbol in the list.  */
-      if (EQ (val, Qunbound))
-        result = Fcons (XCAR (elt), result);
-      /* Otherwise, put (symbol . value) in the list.  */
-      else
-        result = Fcons (Fcons (XCAR (elt), val), result);
+      result = Fcons (Fcons (XCAR (elt), val), result);
     }
 
   return result;
@@ -1563,7 +1547,7 @@ with SIGHUP.  */)
       Lisp_Object tem;
       tem = Fsymbol_value (intern ("delete-auto-save-files"));
       if (! NILP (tem))
-        internal_delete_file (b->auto_save_file_name);
+        internal_delete_file (b->auto_save_file_name, Qt);
     }
 
   if (b->base_buffer)
@@ -1862,8 +1846,7 @@ set_buffer_internal_1 (b)
      register struct buffer *b;
 {
   register struct buffer *old_buf;
-  register Lisp_Object tail, valcontents;
-  Lisp_Object tem;
+  register Lisp_Object tail;
 
 #ifdef USE_MMAP_FOR_BUFFERS
   if (b->text->beg == NULL)
@@ -1935,34 +1918,21 @@ set_buffer_internal_1 (b)
   /* Look down buffer's list of local Lisp variables
      to find and update any that forward into C variables. */
 
-  for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail))
+  do
     {
-      if (CONSP (XCAR (tail))
-          && SYMBOLP (XCAR (XCAR (tail)))
-          && (valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))),
-              (BUFFER_LOCAL_VALUEP (valcontents)))
-          && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
-              (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
-        /* Just reference the variable to cause it to become set for
-           this buffer.  */
-        Fsymbol_value (XCAR (XCAR (tail)));
+      for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail))
+        {
+          Lisp_Object var = XCAR (XCAR (tail));
+          struct Lisp_Symbol *sym = XSYMBOL (var);
+          if (sym->redirect == SYMBOL_LOCALIZED /* Just to be sure.  */
+              && SYMBOL_BLV (sym)->fwd)
+            /* Just reference the variable
+               to cause it to become set for this buffer.  */
+            Fsymbol_value (var);
+        }
     }
-
   /* Do the same with any others that were local to the previous buffer */
-
-  if (old_buf)
-    for (tail = old_buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
-      {
-        if (CONSP (tail)
-            && SYMBOLP (XCAR (XCAR (tail)))
-            && (valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))),
-                (BUFFER_LOCAL_VALUEP (valcontents)))
-            && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
-                (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
-          /* Just reference the variable to cause it to become set for
-             this buffer.  */
-          Fsymbol_value (XCAR (XCAR (tail)));
-      }
+  while (b != old_buf && (b = old_buf, b));
 }
 
 /* Switch to buffer B temporarily for redisplay purposes.
@@ -2677,23 +2647,22 @@ static void
 swap_out_buffer_local_variables (b)
      struct buffer *b;
 {
-  Lisp_Object oalist, alist, sym, buffer;
+  Lisp_Object oalist, alist, buffer;
 
   XSETBUFFER (buffer, b);
   oalist = b->local_var_alist;
 
   for (alist = oalist; CONSP (alist); alist = XCDR (alist))
     {
-      if (CONSP (XCAR (alist))
-          && (sym = XCAR (XCAR (alist)), SYMBOLP (sym))
-          /* Need not do anything if some other buffer's binding is
-             now encached.  */
-          && EQ (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer,
-                 buffer))
+      Lisp_Object sym = XCAR (XCAR (alist));
+      eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
+      /* Need not do anything if some other buffer's binding is
+         now encached.  */
+      if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
         {
           /* Symbol is set up for this buffer's old local value:
              swap it out!  */
-          swap_in_global_binding (sym);
+          swap_in_global_binding (XSYMBOL (sym));
         }
     }
 }
@@ -5162,7 +5131,9 @@ init_buffer_once ()
   /* Make sure all markable slots in buffer_defaults
      are initialized reasonably, so mark_buffer won't choke.  */
   reset_buffer (&buffer_defaults);
+  eassert (EQ (buffer_defaults.name, make_number (0)));
   reset_buffer_local_variables (&buffer_defaults, 1);
+  eassert (EQ (buffer_local_symbols.name, make_number (0)));
   reset_buffer (&buffer_local_symbols);
   reset_buffer_local_variables (&buffer_local_symbols, 1);
   /* Prevent GC from getting confused.  */
@@ -5204,7 +5175,6 @@ init_buffer_once ()
   buffer_defaults.word_wrap = Qnil;
   buffer_defaults.ctl_arrow = Qt;
   buffer_defaults.bidi_display_reordering = Qnil;
-  buffer_defaults.direction_reversed = Qnil;
   buffer_defaults.bidi_paragraph_direction = Qnil;
   buffer_defaults.cursor_type = Qt;
   buffer_defaults.extra_line_spacing = Qnil;
@@ -5291,7 +5261,6 @@ init_buffer_once ()
   XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx;
   XSETFASTINT (buffer_local_flags.category_table, idx); ++idx;
   XSETFASTINT (buffer_local_flags.bidi_display_reordering, idx); ++idx;
-  XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx;
   XSETFASTINT (buffer_local_flags.bidi_paragraph_direction, idx); ++idx;
   XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);
   /* Make this one a permanent local.  */
@@ -5421,33 +5390,41 @@ init_buffer ()
    in the buffer that is current now. */
 
 /* TYPE is nil for a general Lisp variable.
-   An integer specifies a type; then only LIsp values
+   An integer specifies a type; then only Lisp values
    with that type code are allowed (except that nil is allowed too).
-   LNAME is the LIsp-level variable name.
+   LNAME is the Lisp-level variable name.
    VNAME is the name of the buffer slot.
    DOC is a dummy where you write the doc string as a comment.  */
-#define DEFVAR_PER_BUFFER(lname, vname, type, doc)  \
- defvar_per_buffer (lname, vname, type, 0)
+#define DEFVAR_PER_BUFFER(lname, vname, type, doc)                      \
+  do {                                                                  \
+    static struct Lisp_Buffer_Objfwd bo_fwd;                            \
+    defvar_per_buffer (&bo_fwd, lname, vname, type, 0);                 \
+  } while (0)
 
 static void
-defvar_per_buffer (namestring, address, type, doc)
+defvar_per_buffer (bo_fwd, namestring, address, type, doc)
+     struct Lisp_Buffer_Objfwd *bo_fwd;
      char *namestring;
      Lisp_Object *address;
      Lisp_Object type;
      char *doc;
 {
-  Lisp_Object sym, val;
+  struct Lisp_Symbol *sym;
   int offset;
 
-  sym = intern (namestring);
-  val = allocate_misc ();
+  sym = XSYMBOL (intern (namestring));
   offset = (char *)address - (char *)current_buffer;
 
-  XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
-  XBUFFER_OBJFWD (val)->offset = offset;
-  XBUFFER_OBJFWD (val)->slottype = type;
-  SET_SYMBOL_VALUE (sym, val);
-  PER_BUFFER_SYMBOL (offset) = sym;
+  bo_fwd->type = Lisp_Fwd_Buffer_Obj;
+  bo_fwd->offset = offset;
+  bo_fwd->slottype = type;
+  sym->redirect = SYMBOL_FORWARDED;
+  {
+    /* I tried to do the job without a cast, but it seems impossible.
+       union Lisp_Fwd *fwd; &(fwd->u_buffer_objfwd) = bo_fwd;  */
+    SET_SYMBOL_FWD (sym, (union Lisp_Fwd *)bo_fwd);
+  }
+  XSETSYMBOL (PER_BUFFER_SYMBOL (offset), sym);
 
   if (PER_BUFFER_IDX (offset) == 0)
     /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
@@ -5805,25 +5782,19 @@ The variable `coding-system-for-write', if non-nil, overrides this variable.
 
 This variable is never applied to a way of decoding a file while reading it.  */);
 
-  DEFVAR_PER_BUFFER ("direction-reversed",
-                     &current_buffer->direction_reversed, Qnil,
-                     doc: /* Non-nil means set beginning of lines at the right edge of the window.
-See also the variable `bidi-display-reordering'.  */);
-
   DEFVAR_PER_BUFFER ("bidi-display-reordering",
                      &current_buffer->bidi_display_reordering, Qnil,
-                     doc: /* Non-nil means reorder bidirectional text for display in the visual order.
-See also the variable `direction-reversed'.  */);
+                     doc: /* Non-nil means reorder bidirectional text for display in the visual order.  */);
 
   DEFVAR_PER_BUFFER ("bidi-paragraph-direction",
                      &current_buffer->bidi_paragraph_direction, Qnil,
                      doc: /* *If non-nil, forces directionality of text paragraphs in the buffer.
-                             
+
 If this is nil (the default), the direction of each paragraph is
 determined by the first strong directional character of its text.
 The values of `right-to-left' and `left-to-right' override that.
 Any other value is treated as nil.
-                             
+
 This variable has no effect unless the buffer's value of
 \`bidi-display-reordering' is non-nil.  */);
 
diff --git a/src/buffer.h b/src/buffer.h
index fa3fc6dafb8..d03152abd85 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -107,6 +107,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BUF_BEG(buf) (BEG)
 #define BUF_BEG_BYTE(buf) (BEG_BYTE)
 
+/* !!!FIXME:  all the BUF_BEGV/BUF_ZV/BUF_PT macros are flawed:
+   on indirect (or base) buffers, that value is only correct if that buffer
+   is the current_buffer, or if the buffer's text hasn't been modified (via
+   an indirect buffer) since it was last current.  */
+
 /* Position of beginning of accessible range of buffer.  */
 #define BUF_BEGV(buf) ((buf)->begv)
 #define BUF_BEGV_BYTE(buf) ((buf)->begv_byte)
@@ -313,7 +318,7 @@ while (0)
  - (ptr - (current_buffer)->text->beg <= (unsigned) (GPT_BYTE - BEG_BYTE) ? 0 : GAP_SIZE) \
  + BEG_BYTE)
 
-/* Return character at position POS.  */
+/* Return character at byte position POS.  */
 
 #define FETCH_CHAR(pos)                                 \
   (!NILP (current_buffer->enable_multibyte_characters)  \
@@ -327,7 +332,7 @@ while (0)
 /* Variables used locally in FETCH_MULTIBYTE_CHAR.  */
 extern unsigned char *_fetch_multibyte_char_p;
 
-/* Return character code of multi-byte form at position POS.  If POS
+/* Return character code of multi-byte form at byte position POS.  If POS
    doesn't point the head of valid multi-byte form, only the byte at
    POS is returned.  No range checking.  */
 
@@ -336,7 +341,7 @@ extern unsigned char *_fetch_multibyte_char_p;
                                + (pos) + BEG_ADDR - BEG_BYTE),          \
    STRING_CHAR (_fetch_multibyte_char_p))
 
-/* Return character at position POS.  If the current buffer is unibyte
+/* Return character at byte position POS.  If the current buffer is unibyte
    and the character is not ASCII, make the returning character
    multibyte.  */
 
@@ -447,7 +452,10 @@ struct buffer_text
     /* The markers that refer to this buffer.
        This is actually a single marker ---
        successive elements in its marker `chain'
-       are the other markers referring to this buffer.  */
+       are the other markers referring to this buffer.
+       This is a singly linked unordered list, which means that it's
+       very cheap to add a marker to the list and it's also very cheap
+       to move a marker within a buffer.  */
     struct Lisp_Marker *markers;
 
     /* Usually 0.  Temporarily set to 1 in decode_coding_gap to
@@ -671,9 +679,6 @@ struct buffer
   /* Non-nil means reorder bidirectional text for display in the
      visual order.  */
   Lisp_Object bidi_display_reordering;
-  /* Non-nil means set beginning of lines at the right edge of
-     windows.  */
-  Lisp_Object direction_reversed;
   /* If non-nil, specifies which direction of text to force in all the
      paragraphs of the buffer.  Nil means determine paragraph
      direction dynamically for each paragraph.  */
@@ -843,6 +848,7 @@ extern struct buffer buffer_defaults;
    be a Lisp-level local variable for the slot, it has no default value,
    and the corresponding slot in buffer_defaults is not used.  */
 
+
 extern struct buffer buffer_local_flags;
 
 /* For each buffer slot, this points to the Lisp symbol name
@@ -948,7 +954,7 @@ extern int last_per_buffer_idx;
    from the start of a buffer structure.  */
 
 #define PER_BUFFER_VAR_OFFSET(VAR) \
-    ((char *) &buffer_local_flags.VAR - (char *) &buffer_local_flags)
+  ((char *) &((struct buffer *)0)->VAR - (char *) ((struct buffer *)0))
 
 /* Return the index of buffer-local variable VAR.  Each per-buffer
    variable has an index > 0 associated with it, except when it always
@@ -1013,11 +1019,5 @@ extern int last_per_buffer_idx;
 #define PER_BUFFER_VALUE(BUFFER, OFFSET) \
       (*(Lisp_Object *)((OFFSET) + (char *) (BUFFER)))
 
-/* Return the symbol of the per-buffer variable at offset OFFSET in
-   the buffer structure.  */
-
-#define PER_BUFFER_SYMBOL(OFFSET) \
-      (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_symbols))
-
 /* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1
    (do not change this comment) */
diff --git a/src/bytecode.c b/src/bytecode.c
index e95614c72a9..c53c5acdbb3 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -505,8 +505,9 @@ If the third argument is incorrect, Emacs may crash.  */)
             v1 = vectorp[op];
             if (SYMBOLP (v1))
               {
-                v2 = SYMBOL_VALUE (v1);
-                if (MISCP (v2) || EQ (v2, Qunbound))
+                if (XSYMBOL (v1)->redirect != SYMBOL_PLAINVAL
+                    || (v2 = SYMBOL_VAL (XSYMBOL (v1)),
+                        EQ (v2, Qunbound)))
                   {
                     BEFORE_POTENTIAL_GC ();
                     v2 = Fsymbol_value (v1);
@@ -597,14 +598,13 @@ If the third argument is incorrect, Emacs may crash.  */)
             /* Inline the most common case.  */
             if (SYMBOLP (sym)
                 && !EQ (val, Qunbound)
-                && !XSYMBOL (sym)->indirect_variable
-                && !SYMBOL_CONSTANT_P (sym)
-                && !MISCP (XSYMBOL (sym)->value))
-              XSYMBOL (sym)->value = val;
+                && !XSYMBOL (sym)->redirect
+                && !SYMBOL_CONSTANT_P (sym))
+              XSYMBOL (sym)->val.value = val;
             else
               {
                 BEFORE_POTENTIAL_GC ();
-                set_internal (sym, val, current_buffer, 0);
+                set_internal (sym, val, Qnil, 0);
                 AFTER_POTENTIAL_GC ();
               }
           }
diff --git a/src/callproc.c b/src/callproc.c
index 378c647f385..44dd6ed7764 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -91,7 +91,7 @@ extern char **environ;
 #endif
 
 #ifdef HAVE_SETPGID
-#if !defined (USG) || defined (BSD_PGRPS)
+#if !defined (USG)
 #undef setpgrp
 #define setpgrp setpgid
 #endif
@@ -581,7 +581,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 #ifdef HAVE_SETSID
         setsid ();
 #endif
-#if defined (USG) && !defined (BSD_PGRPS)
+#if defined (USG)
         setpgrp ();
 #else
         setpgrp (pid, pid);
@@ -856,7 +856,7 @@ delete_temp_file (name)
   /* Suppress jka-compr handling, etc.  */
   int count = SPECPDL_INDEX ();
   specbind (intern ("file-name-handler-alist"), Qnil);
-  internal_delete_file (name);
+  internal_delete_file (name, Qt);
   unbind_to (count, Qnil);
   return Qnil;
 }
@@ -1251,7 +1251,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
 #endif /* not MSDOS */
 #endif /* not WINDOWSNT */
 
-#if defined(USG) && !defined(BSD_PGRPS)
+#if defined(USG)
 #ifndef SETPGRP_RELEASES_CTTY
   setpgrp ();                   /* No arguments but equivalent in this case */
 #endif
diff --git a/src/character.h b/src/character.h
index 1f1f6eade84..41f47e4b179 100644
--- a/src/character.h
+++ b/src/character.h
@@ -296,7 +296,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* If P is after LIMIT, advance P to the previous character boundary.
    Assumes that P is already at a character boundary of the same
-   mulitbyte form whose beginning address is LIMIT.  */
+   multibyte form whose beginning address is LIMIT.  */
 
 #define PREV_CHAR_BOUNDARY(p, limit)                                    \
   do {                                                                  \
diff --git a/src/charset.c b/src/charset.c
index 125c9131687..18c0bbb6310 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2082,8 +2082,9 @@ char_charset (c, charset_list, code_return)
           return charset;
         }
       charset_list = XCDR (charset_list);
-      if (c <= MAX_UNICODE_CHAR
-         && EQ (charset_list, Vcharset_non_preferred_head))
+      if (! maybe_null
+          && c <= MAX_UNICODE_CHAR
+          && EQ (charset_list, Vcharset_non_preferred_head))
         return CHARSET_FROM_ID (charset_unicode);
     }
   return (maybe_null ? NULL
diff --git a/src/coding.c b/src/coding.c
index bdc37cb7c53..6435fa1ddb1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6408,7 +6408,7 @@ detect_coding (coding)
                         {
                           /* We didn't find an 8-bit code.  We may
                              have found a null-byte, but it's very
-                             rare that a binary file confirm to
+                             rare that a binary file conforms to
                              ISO-2022.  */
                           src = src_end;
                           coding->head_ascii = src - coding->source;
diff --git a/src/composite.c b/src/composite.c
index 632c9f90d12..341eb371871 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -74,8 +74,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
         composition rules to tell how to compose (2N+2)th element with
         the previously composed 2N glyphs.
 
-   COMPONENTS-VEC -- Vector of integers.  In relative composition, the
-        elements are characters to be composed.  In rule-base
+   COMPONENTS-VEC -- Vector of integers.  In a relative composition,
+        the elements are the characters to be composed.  In a rule-base
         composition, the elements are characters or encoded
         composition rules.
 
@@ -95,13 +95,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    get_composition_id checks the validity of `composition' property,
    and, if valid, assigns a new ID, registers the information in
    composition_hash_table and composition_table, and changes the form
-   of the property value.  If the property is invalid, return -1
-   without changing the property value.
+   of the property value.  If the property is invalid,
+   get_composition_id returns -1 without changing the property value.
 
-   We use two tables to keep information about composition;
+   We use two tables to keep the information about composition;
    composition_hash_table and composition_table.
 
-   The former is a hash table in which keys are COMPONENTS-VECs and
+   The former is a hash table whose keys are COMPONENTS-VECs and
    values are the corresponding COMPOSITION-IDs.  This hash table is
    weak, but as each key (COMPONENTS-VEC) is also kept as a value of the
    `composition' property, it won't be collected as garbage until all
@@ -162,8 +162,8 @@ Lisp_Object Vauto_composition_function;
 Lisp_Object Qauto_composition_function;
 Lisp_Object Vcomposition_function_table;
 
-/* Maxinum number of characters to lookback to check
-   auto-composition.  */
+/* Maximum number of characters to look back for
+   auto-compositions.  */
 #define MAX_AUTO_COMPOSITION_LOOKBACK 3
 
 EXFUN (Fremove_list_of_text_properties, 4);
@@ -990,6 +990,14 @@ autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
             {
               Lisp_Object args[6];
 
+              /* Save point as marker before calling out to lisp.  */
+              if (NILP (string))
+                {
+                  Lisp_Object m = Fmake_marker ();
+                  set_marker_both (m, Qnil, pt, pt_byte);
+                  record_unwind_protect (restore_point_unwind, m);
+                }
+
               args[0] = Vauto_composition_function;
               args[1] = AREF (elt, 2);
               args[2] = pos;
@@ -998,8 +1006,10 @@ autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
               args[5] = string;
               gstring = safe_call (6, args);
             }
-          if (NILP (string))
-            TEMP_SET_PT_BOTH (pt, pt_byte);
+          else if (NILP (string))
+            {
+              TEMP_SET_PT_BOTH (pt, pt_byte);
+            }
           return unbind_to (count, gstring);
         }
     }
@@ -1011,7 +1021,7 @@ autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
 
 /* Update cmp_it->stop_pos to the next position after CHARPOS (and
    BYTEPOS) where character composition may happen.  If BYTEPOS is
-   negative, compoute it.  If it is a static composition, set
+   negative, compute it.  If it is a static composition, set
    cmp_it->ch to -1.  Otherwise, set cmp_it->ch to the character that
    triggers a automatic composition.  */
 
@@ -1241,7 +1251,7 @@ struct position_record
   unsigned char *p;
 };
 
-/* Update the members of POSTION to the next character boundary.  */
+/* Update the members of POSITION to the next character boundary.  */
 #define FORWARD_CHAR(POSITION, STOP)                                    \
   do {                                                                  \
     (POSITION).pos++;                                                   \
@@ -1257,7 +1267,7 @@ struct position_record
       }                                                                 \
   } while (0)
 
-/* Update the members of POSTION to the previous character boundary.  */
+/* Update the members of POSITION to the previous character boundary.  */
 #define BACKWARD_CHAR(POSITION, STOP)           \
   do {                                          \
     if ((POSITION).pos == STOP)                 \
@@ -1429,7 +1439,7 @@ find_automatic_composition (pos, limit, start, end, gstring, string)
             }
           if (need_adjustment)
             {
-              /* As we have called Lisp, there's a possibilily that
+              /* As we have called Lisp, there's a possibility that
                  buffer/string is relocated.  */
               if (NILP (string))
                 cur.p  = BYTE_POS_ADDR (cur.pos_byte);
@@ -1674,7 +1684,7 @@ See `find-composition' for more details.  */)
 
       if (find_automatic_composition (from, to, &s, &e, &gstring, string)
           && (e <= XINT (pos) ? e > end : s < start))
-        return list3 (make_number (start), make_number (end), gstring);
+        return list3 (make_number (s), make_number (e), gstring);
     }
   if (!COMPOSITION_VALID_P (start, end, prop))
     return Fcons (make_number (start), Fcons (make_number (end),
diff --git a/src/config.in b/src/config.in
index e1837e74560..9020d976342 100644
--- a/src/config.in
+++ b/src/config.in
@@ -135,8 +135,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <com_err.h> header file. */
 #undef HAVE_COM_ERR_H
 
-/* Define to 1 if you have /usr/lib/crti.o. */
-#undef HAVE_CRTIN
+/* Define to 1 if you have the `copysign' function. */
+#undef HAVE_COPYSIGN
 
 /* Define to 1 if using D-Bus. */
 #undef HAVE_DBUS
@@ -294,6 +294,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 
+/* Define to 1 if using imagemagick. */
+#undef HAVE_IMAGEMAGICK
+
 /* Define to 1 if you have the `index' function. */
 #undef HAVE_INDEX
 
@@ -303,6 +306,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `isnan' function. */
+#undef HAVE_ISNAN
+
 /* Define to 1 if you have the jpeg library (-ljpeg). */
 #undef HAVE_JPEG
 
@@ -318,10 +324,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <kerberos/krb.h> header file. */
 #undef HAVE_KERBEROS_KRB_H
 
-/* Define to 1 if `e_text' is a member of `krb5_error'. */
+/* Define to 1 if `e_text' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_E_TEXT
 
-/* Define to 1 if `text' is a member of `krb5_error'. */
+/* Define to 1 if `text' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_TEXT
 
 /* Define to 1 if you have the <krb5.h> header file. */
@@ -333,9 +339,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* Define to 1 if the directory /usr/lib64 exists. */
-#undef HAVE_LIB64_DIR
-
 /* Define to 1 if you have the `com_err' library (-lcom_err). */
 #undef HAVE_LIBCOM_ERR
 
@@ -399,15 +402,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the resolv library (-lresolv). */
 #undef HAVE_LIBRESOLV
 
+/* Define to 1 if using SELinux. */
+#undef HAVE_LIBSELINUX
+
 /* Define to 1 if you have the `Xext' library (-lXext). */
 #undef HAVE_LIBXEXT
 
 /* Define to 1 if you have the `Xmu' library (-lXmu). */
 #undef HAVE_LIBXMU
 
-/* Define to 1 if you have the Xp library (-lXp). */
-#undef HAVE_LIBXP
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -488,9 +491,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have Motif 2.1 or newer. */
-#undef HAVE_MOTIF_2_1
-
 /* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
@@ -615,25 +615,25 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
-/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_ADDR
 
-/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
 
-/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_FLAGS
 
-/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
 
-/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_NETMASK
 
-/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
+/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
@@ -813,10 +813,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    its own, you might want to add "-L/..." or something similar. */
 #undef LD_SWITCH_X_SITE
 
-/* Define LD_SWITCH_X_SITE_AUX with an -R option in case it's needed (for
-   Solaris, for example). */
-#undef LD_SWITCH_X_SITE_AUX
-
 /* Define to 1 if localtime caches TZ. */
 #undef LOCALTIME_CACHE
 
@@ -826,6 +822,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to unlink, rather than empty, mail spool after reading. */
 #undef MAIL_UNLINK_SPOOL
 
+/* Define if the mailer uses flock to interlock the mail spool. */
+#undef MAIL_USE_FLOCK
+
+/* Define if the mailer uses lockf to interlock the mail spool. */
+#undef MAIL_USE_LOCKF
+
 /* Define to support MMDF mailboxes in movemail. */
 #undef MAIL_USE_MMDF
 
@@ -860,9 +862,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -897,6 +896,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Process async input synchronously. */
 #undef SYNC_INPUT
 
+/* Define to 1 if you use terminfo instead of termcap. */
+#undef TERMINFO
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
@@ -910,9 +912,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    <sys/cpustats.h>. */
 #undef UMAX4_3
 
-/* Define to the unexec source file name. */
-#undef UNEXEC_SRC
-
 /* Define to 1 if using GTK. */
 #undef USE_GTK
 
@@ -1078,9 +1077,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
 # ifdef NS_IMPL_GNUSTEP
-/* See also .m.o rule in Makefile.in */
-/* FIXME: are all these flags really needed?  Document here why.  */
-#  define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
 /* GNUstep needs a bit more pure memory.  Of the existing knobs,
 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.  */
 #  define SYSTEM_PURESIZE_EXTRA 30000
diff --git a/src/data.c b/src/data.c
index bdba3a9bb36..2d71434cc76 100644
--- a/src/data.c
+++ b/src/data.c
@@ -91,7 +91,7 @@ Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
 
 Lisp_Object Qinteractive_form;
 
-static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object));
+static void swap_in_symval_forwarding (struct Lisp_Symbol *, struct Lisp_Buffer_Local_Value *);
 
 Lisp_Object Vmost_positive_fixnum, Vmost_negative_fixnum;
 
@@ -582,12 +582,35 @@ DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
      register Lisp_Object symbol;
 {
   Lisp_Object valcontents;
+  struct Lisp_Symbol *sym;
   CHECK_SYMBOL (symbol);
+  sym = XSYMBOL (symbol);
 
-  valcontents = SYMBOL_VALUE (symbol);
-
-  if (BUFFER_LOCAL_VALUEP (valcontents))
-    valcontents = swap_in_symval_forwarding (symbol, valcontents);
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_PLAINVAL: valcontents = SYMBOL_VAL (sym); break;
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_LOCALIZED:
+      {
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        if (blv->fwd)
+          /* In set_internal, we un-forward vars when their value is
+             set to Qunbound. */
+          return Qt;
+        else
+          {
+            swap_in_symval_forwarding (sym, blv);
+            valcontents = BLV_VALUE (blv);
+          }
+        break;
+      }
+    case SYMBOL_FORWARDED:
+      /* In set_internal, we un-forward vars when their value is
+         set to Qunbound. */
+      return Qt;
+    default: abort ();
+    }
 
   return (EQ (valcontents, Qunbound) ? Qnil : Qt);
 }
@@ -824,14 +847,14 @@ indirect_variable (symbol)
 
   hare = tortoise = symbol;
 
-  while (hare->indirect_variable)
+  while (hare->redirect == SYMBOL_VARALIAS)
     {
-      hare = XSYMBOL (hare->value);
-      if (!hare->indirect_variable)
+      hare = SYMBOL_ALIAS (hare);
+      if (hare->redirect != SYMBOL_VARALIAS)
         break;
 
-      hare = XSYMBOL (hare->value);
-      tortoise = XSYMBOL (tortoise->value);
+      hare = SYMBOL_ALIAS (hare);
+      tortoise = SYMBOL_ALIAS (tortoise);
 
       if (hare == tortoise)
         {
@@ -865,44 +888,46 @@ variable chain of symbols.  */)
    This does not handle buffer-local variables; use
    swap_in_symval_forwarding for that.  */
 
+#define do_blv_forwarding(blv) \
+  ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv))
+
 Lisp_Object
 do_symval_forwarding (valcontents)
-     register Lisp_Object valcontents;
+     register union Lisp_Fwd *valcontents;
 {
   register Lisp_Object val;
-  if (MISCP (valcontents))
-    switch (XMISCTYPE (valcontents))
-      {
-      case Lisp_Misc_Intfwd:
-        XSETINT (val, *XINTFWD (valcontents)->intvar);
-        return val;
-
-      case Lisp_Misc_Boolfwd:
-        return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil);
-
-      case Lisp_Misc_Objfwd:
-        return *XOBJFWD (valcontents)->objvar;
-
-      case Lisp_Misc_Buffer_Objfwd:
-        return PER_BUFFER_VALUE (current_buffer,
-                                 XBUFFER_OBJFWD (valcontents)->offset);
-
-      case Lisp_Misc_Kboard_Objfwd:
-        /* We used to simply use current_kboard here, but from Lisp
-           code, it's value is often unexpected.  It seems nicer to
-           allow constructions like this to work as intuitively expected:
-
-                (with-selected-frame frame
-                   (define-key local-function-map "\eOP" [f1]))
-
-           On the other hand, this affects the semantics of
-           last-command and real-last-command, and people may rely on
-           that.  I took a quick look at the Lisp codebase, and I
-           don't think anything will break.  --lorentey  */
-        return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset
-                                + (char *)FRAME_KBOARD (SELECTED_FRAME ()));
-      }
-  return valcontents;
+  switch (XFWDTYPE (valcontents))
+    {
+    case Lisp_Fwd_Int:
+      XSETINT (val, *XINTFWD (valcontents)->intvar);
+      return val;
+
+    case Lisp_Fwd_Bool:
+      return (*XBOOLFWD (valcontents)->boolvar ? Qt : Qnil);
+
+    case Lisp_Fwd_Obj:
+      return *XOBJFWD (valcontents)->objvar;
+
+    case Lisp_Fwd_Buffer_Obj:
+      return PER_BUFFER_VALUE (current_buffer,
+                               XBUFFER_OBJFWD (valcontents)->offset);
+
+    case Lisp_Fwd_Kboard_Obj:
+      /* We used to simply use current_kboard here, but from Lisp
+         code, it's value is often unexpected.  It seems nicer to
+         allow constructions like this to work as intuitively expected:
+
+         (with-selected-frame frame
+         (define-key local-function-map "\eOP" [f1]))
+
+         On the other hand, this affects the semantics of
+         last-command and real-last-command, and people may rely on
+         that.  I took a quick look at the Lisp codebase, and I
+         don't think anything will break.  --lorentey  */
+      return *(Lisp_Object *)(XKBOARD_OBJFWD (valcontents)->offset
+                              + (char *)FRAME_KBOARD (SELECTED_FRAME ()));
+    default: abort ();
+    }
 }
 
 /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell
@@ -913,102 +938,93 @@ do_symval_forwarding (valcontents)
    BUF non-zero means set the value in buffer BUF instead of the
    current buffer.  This only plays a role for per-buffer variables.  */
 
-void
-store_symval_forwarding (symbol, valcontents, newval, buf)
-     Lisp_Object symbol;
-     register Lisp_Object valcontents, newval;
+#define store_blv_forwarding(blv, newval, buf)                  \
+  do {                                                          \
+    if ((blv)->forwarded)                                       \
+      store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \
+    else                                                        \
+      SET_BLV_VALUE (blv, newval);                              \
+  } while (0)
+
+static void
+store_symval_forwarding (/* symbol, */ valcontents, newval, buf)
+     /* struct Lisp_Symbol *symbol; */
+     union Lisp_Fwd *valcontents;
+     register Lisp_Object newval;
      struct buffer *buf;
 {
-  switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
+  switch (XFWDTYPE (valcontents))
     {
-    case Lisp_Misc:
-      switch (XMISCTYPE (valcontents))
+    case Lisp_Fwd_Int:
+      CHECK_NUMBER (newval);
+      *XINTFWD (valcontents)->intvar = XINT (newval);
+      break;
+      
+    case Lisp_Fwd_Bool:
+      *XBOOLFWD (valcontents)->boolvar = !NILP (newval);
+      break;
+      
+    case Lisp_Fwd_Obj:
+      *XOBJFWD (valcontents)->objvar = newval;
+      
+      /* If this variable is a default for something stored
+         in the buffer itself, such as default-fill-column,
+         find the buffers that don't have local values for it
+         and update them.  */
+      if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults
+          && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1))
         {
-        case Lisp_Misc_Intfwd:
-          CHECK_NUMBER (newval);
-          *XINTFWD (valcontents)->intvar = XINT (newval);
-          /* This can never happen since intvar points to an EMACS_INT
-             which is at least large enough to hold a Lisp_Object.
-             if (*XINTFWD (valcontents)->intvar != XINT (newval))
-               error ("Value out of range for variable `%s'",
-                   SDATA (SYMBOL_NAME (symbol))); */
-          break;
-
-        case Lisp_Misc_Boolfwd:
-          *XBOOLFWD (valcontents)->boolvar = !NILP (newval);
-          break;
-
-        case Lisp_Misc_Objfwd:
-          *XOBJFWD (valcontents)->objvar = newval;
-
-          /* If this variable is a default for something stored
-             in the buffer itself, such as default-fill-column,
-             find the buffers that don't have local values for it
-             and update them.  */
-          if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults
-              && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1))
+          int offset = ((char *) XOBJFWD (valcontents)->objvar
+                        - (char *) &buffer_defaults);
+          int idx = PER_BUFFER_IDX (offset);
+          
+          Lisp_Object tail;
+          
+          if (idx <= 0)
+            break;
+          
+          for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
             {
-              int offset = ((char *) XOBJFWD (valcontents)->objvar
-                            - (char *) &buffer_defaults);
-              int idx = PER_BUFFER_IDX (offset);
-
-              Lisp_Object tail;
-
-              if (idx <= 0)
-                break;
-
-              for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
-                {
-                  Lisp_Object buf;
-                  struct buffer *b;
+              Lisp_Object buf;
+              struct buffer *b;
 
-                  buf = Fcdr (XCAR (tail));
-                  if (!BUFFERP (buf)) continue;
-                  b = XBUFFER (buf);
+              buf = Fcdr (XCAR (tail));
+              if (!BUFFERP (buf)) continue;
+              b = XBUFFER (buf);
 
-                  if (! PER_BUFFER_VALUE_P (b, idx))
-                    PER_BUFFER_VALUE (b, offset) = newval;
-                }
+              if (! PER_BUFFER_VALUE_P (b, idx))
+                PER_BUFFER_VALUE (b, offset) = newval;
             }
-          break;
-
-        case Lisp_Misc_Buffer_Objfwd:
-          {
-            int offset = XBUFFER_OBJFWD (valcontents)->offset;
-            Lisp_Object type = XBUFFER_OBJFWD (valcontents)->slottype;
-
-            if (!(NILP (type) || NILP (newval)
-                  || (XINT (type) == LISP_INT_TAG
-                      ? INTEGERP (newval)
-                      : XTYPE (newval) == XINT (type))))
-              buffer_slot_type_mismatch (newval, XINT (type));
-
-            if (buf == NULL)
-              buf = current_buffer;
-            PER_BUFFER_VALUE (buf, offset) = newval;
-          }
-          break;
+        }
+      break;
 
-        case Lisp_Misc_Kboard_Objfwd:
-          {
-            char *base = (char *) FRAME_KBOARD (SELECTED_FRAME ());
-            char *p = base + XKBOARD_OBJFWD (valcontents)->offset;
-            *(Lisp_Object *) p = newval;
-          }
-          break;
+    case Lisp_Fwd_Buffer_Obj:
+      {
+        int offset = XBUFFER_OBJFWD (valcontents)->offset;
+        Lisp_Object type = XBUFFER_OBJFWD (valcontents)->slottype;
+
+        if (!(NILP (type) || NILP (newval)
+              || (XINT (type) == LISP_INT_TAG
+                  ? INTEGERP (newval)
+                  : XTYPE (newval) == XINT (type))))
+          buffer_slot_type_mismatch (newval, XINT (type));
+
+        if (buf == NULL)
+          buf = current_buffer;
+        PER_BUFFER_VALUE (buf, offset) = newval;
+      }
+      break;
 
-        default:
-          goto def;
-        }
+    case Lisp_Fwd_Kboard_Obj:
+      {
+        char *base = (char *) FRAME_KBOARD (SELECTED_FRAME ());
+        char *p = base + XKBOARD_OBJFWD (valcontents)->offset;
+        *(Lisp_Object *) p = newval;
+      }
       break;
 
     default:
-    def:
-      valcontents = SYMBOL_VALUE (symbol);
-      if (BUFFER_LOCAL_VALUEP (valcontents))
-        XBUFFER_LOCAL_VALUE (valcontents)->realvalue = newval;
-      else
-        SET_SYMBOL_VALUE (symbol, newval);
+      abort (); /* goto def; */
     }
 }
 
@@ -1017,25 +1033,22 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
 
 void
 swap_in_global_binding (symbol)
-     Lisp_Object symbol;
+     struct Lisp_Symbol *symbol;
 {
-  Lisp_Object valcontents = SYMBOL_VALUE (symbol);
-  struct Lisp_Buffer_Local_Value *blv = XBUFFER_LOCAL_VALUE (valcontents);
-  Lisp_Object cdr = blv->cdr;
+  struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (symbol);
 
   /* Unload the previously loaded binding.  */
-  Fsetcdr (XCAR (cdr),
-           do_symval_forwarding (blv->realvalue));
+  if (blv->fwd)
+    SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
 
   /* Select the global binding in the symbol.  */
-  XSETCAR (cdr, cdr);
-  store_symval_forwarding (symbol, blv->realvalue, XCDR (cdr), NULL);
+  blv->valcell = blv->defcell;
+  if (blv->fwd)
+    store_symval_forwarding (blv->fwd, XCDR (blv->defcell), NULL);
 
   /* Indicate that the global binding is set up now.  */
-  blv->frame = Qnil;
-  blv->buffer = Qnil;
-  blv->found_for_frame = 0;
-  blv->found_for_buffer = 0;
+  blv->where = Qnil;
+  SET_BLV_FOUND (blv, 0);
 }
 
 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer.
@@ -1045,55 +1058,50 @@ swap_in_global_binding (symbol)
    Return the value forwarded one step past the buffer-local stage.
    This could be another forwarding pointer.  */
 
-static Lisp_Object
-swap_in_symval_forwarding (symbol, valcontents)
-     Lisp_Object symbol, valcontents;
+static void
+swap_in_symval_forwarding (symbol, blv)
+     struct Lisp_Symbol *symbol;
+     struct Lisp_Buffer_Local_Value *blv;
 {
   register Lisp_Object tem1;
 
-  tem1 = XBUFFER_LOCAL_VALUE (valcontents)->buffer;
+  eassert (blv == SYMBOL_BLV (symbol));
+
+  tem1 = blv->where;
 
   if (NILP (tem1)
-      || current_buffer != XBUFFER (tem1)
-      || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame
-          && ! EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)))
+      || (blv->frame_local
+          ? !EQ (selected_frame, tem1)
+          : current_buffer != XBUFFER (tem1)))
     {
-      struct Lisp_Symbol *sym = XSYMBOL (symbol);
-      if (sym->indirect_variable)
-        {
-          sym = indirect_variable (sym);
-          XSETSYMBOL (symbol, sym);
-        }
 
       /* Unload the previously loaded binding.  */
-      tem1 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
-      Fsetcdr (tem1,
-               do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue));
+      tem1 = blv->valcell;
+      if (blv->fwd)
+        SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
       /* Choose the new binding.  */
-      tem1 = assq_no_quit (symbol, current_buffer->local_var_alist);
-      XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0;
-      XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
-      if (NILP (tem1))
-        {
-          if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-            tem1 = assq_no_quit (symbol, XFRAME (selected_frame)->param_alist);
-          if (! NILP (tem1))
-            XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1;
-          else
-            tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr;
-        }
-      else
-        XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1;
+      {
+        Lisp_Object var;
+        XSETSYMBOL (var, symbol);
+        if (blv->frame_local)
+          {
+            tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist);
+            blv->where = selected_frame;
+          }
+        else
+          {
+            tem1 = assq_no_quit (var, current_buffer->local_var_alist);
+            XSETBUFFER (blv->where, current_buffer);
+          }
+      }
+      if (!(blv->found = !NILP (tem1)))
+        tem1 = blv->defcell;
 
       /* Load the new binding.  */
-      XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, tem1);
-      XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, current_buffer);
-      XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
-      store_symval_forwarding (symbol,
-                               XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
-                               Fcdr (tem1), NULL);
+      blv->valcell = tem1;
+      if (blv->fwd)
+        store_symval_forwarding (blv->fwd, BLV_VALUE (blv), NULL);
     }
-  return XBUFFER_LOCAL_VALUE (valcontents)->realvalue;
 }
 
 /* Find the value of a symbol, returning Qunbound if it's not bound.
@@ -1106,16 +1114,27 @@ Lisp_Object
 find_symbol_value (symbol)
      Lisp_Object symbol;
 {
-  register Lisp_Object valcontents;
-  register Lisp_Object val;
+  struct Lisp_Symbol *sym;
 
   CHECK_SYMBOL (symbol);
-  valcontents = SYMBOL_VALUE (symbol);
+  sym = XSYMBOL (symbol);
 
-  if (BUFFER_LOCAL_VALUEP (valcontents))
-    valcontents = swap_in_symval_forwarding (symbol, valcontents);
-
-  return do_symval_forwarding (valcontents);
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym);
+    case SYMBOL_LOCALIZED:
+      {
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        swap_in_symval_forwarding (sym, blv);
+        return blv->fwd ? do_symval_forwarding (blv->fwd) : BLV_VALUE (blv);
+      }
+      /* FALLTHROUGH */
+    case SYMBOL_FORWARDED:
+      return do_symval_forwarding (SYMBOL_FWD (sym));
+    default: abort ();
+    }
 }
 
 DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
@@ -1137,26 +1156,25 @@ DEFUN ("set", Fset, Sset, 2, 2, 0,
      (symbol, newval)
      register Lisp_Object symbol, newval;
 {
-  return set_internal (symbol, newval, current_buffer, 0);
+  set_internal (symbol, newval, Qnil, 0);
+  return newval;
 }
 
 /* Return 1 if SYMBOL currently has a let-binding
    which was made in the buffer that is now current.  */
 
 static int
-let_shadows_buffer_binding_p (symbol)
-     struct Lisp_Symbol *symbol;
+let_shadows_buffer_binding_p (struct Lisp_Symbol *symbol)
 {
-  volatile struct specbinding *p;
+  struct specbinding *p;
 
   for (p = specpdl_ptr - 1; p >= specpdl; p--)
     if (p->func == NULL
         && CONSP (p->symbol))
       {
         struct Lisp_Symbol *let_bound_symbol = XSYMBOL (XCAR (p->symbol));
-        if ((symbol == let_bound_symbol
-             || (let_bound_symbol->indirect_variable
-                 && symbol == indirect_variable (let_bound_symbol)))
+        eassert (let_bound_symbol->redirect != SYMBOL_VARALIAS);
+        if (symbol == let_bound_symbol
             && XBUFFER (XCDR (XCDR (p->symbol))) == current_buffer)
           break;
       }
@@ -1164,141 +1182,173 @@ let_shadows_buffer_binding_p (symbol)
   return p >= specpdl;
 }
 
+static int
+let_shadows_global_binding_p (symbol)
+     Lisp_Object symbol;
+{
+  struct specbinding *p;
+
+  for (p = specpdl_ptr - 1; p >= specpdl; p--)
+    if (p->func == NULL && EQ (p->symbol, symbol))
+      break;
+
+  return p >= specpdl;
+}
+
 /* Store the value NEWVAL into SYMBOL.
-   If buffer-locality is an issue, BUF specifies which buffer to use.
-   (0 stands for the current buffer.)
+   If buffer/frame-locality is an issue, WHERE specifies which context to use.
+   (nil stands for the current buffer/frame).
 
    If BINDFLAG is zero, then if this symbol is supposed to become
    local in every buffer where it is set, then we make it local.
    If BINDFLAG is nonzero, we don't do that.  */
 
-Lisp_Object
-set_internal (symbol, newval, buf, bindflag)
-     register Lisp_Object symbol, newval;
-     struct buffer *buf;
+void
+set_internal (symbol, newval, where, bindflag)
+     register Lisp_Object symbol, newval, where;
      int bindflag;
 {
   int voide = EQ (newval, Qunbound);
-
-  register Lisp_Object valcontents, innercontents, tem1, current_alist_element;
-
-  if (buf == 0)
-    buf = current_buffer;
+  struct Lisp_Symbol *sym;
+  Lisp_Object tem1;
 
   /* If restoring in a dead buffer, do nothing.  */
-  if (NILP (buf->name))
-    return newval;
+  /* if (BUFFERP (where) && NILP (XBUFFER (where)->name))
+      return; */
 
   CHECK_SYMBOL (symbol);
-  if (SYMBOL_CONSTANT_P (symbol)
-      && (NILP (Fkeywordp (symbol))
-          || !EQ (newval, SYMBOL_VALUE (symbol))))
-    xsignal1 (Qsetting_constant, symbol);
-
-  innercontents = valcontents = SYMBOL_VALUE (symbol);
-
-  if (BUFFER_OBJFWDP (valcontents))
+  if (SYMBOL_CONSTANT_P (symbol))
     {
-      int offset = XBUFFER_OBJFWD (valcontents)->offset;
-      int idx = PER_BUFFER_IDX (offset);
-      if (idx > 0
-          && !bindflag
-          && !let_shadows_buffer_binding_p (XSYMBOL (symbol)))
-        SET_PER_BUFFER_VALUE_P (buf, idx, 1);
+      if (NILP (Fkeywordp (symbol))
+          || !EQ (newval, Fsymbol_value (symbol)))
+        xsignal1 (Qsetting_constant, symbol);
+      else
+        /* Allow setting keywords to their own value.  */
+        return;
     }
-  else if (BUFFER_LOCAL_VALUEP (valcontents))
-    {
-      /* valcontents is a struct Lisp_Buffer_Local_Value.   */
-      if (XSYMBOL (symbol)->indirect_variable)
-        XSETSYMBOL (symbol, indirect_variable (XSYMBOL (symbol)));
-
-      /* What binding is loaded right now?  */
-      current_alist_element
-        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
-
-      /* If the current buffer is not the buffer whose binding is
-         loaded, or if there may be frame-local bindings and the frame
-         isn't the right one, or if it's a Lisp_Buffer_Local_Value and
-         the default binding is loaded, the loaded binding may be the
-         wrong one.  */
-      if (!BUFFERP (XBUFFER_LOCAL_VALUE (valcontents)->buffer)
-          || buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer)
-          || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame
-              && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))
-          /* Also unload a global binding (if the var is local_if_set). */
-          || (EQ (XCAR (current_alist_element),
-                  current_alist_element)))
-        {
-          /* The currently loaded binding is not necessarily valid.
-             We need to unload it, and choose a new binding.  */
-
-          /* Write out `realvalue' to the old loaded binding.  */
-          Fsetcdr (current_alist_element,
-                   do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue));
 
-          /* Find the new binding.  */
-          tem1 = Fassq (symbol, buf->local_var_alist);
-          XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1;
-          XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 0;
+  sym = XSYMBOL (symbol);
 
-          if (NILP (tem1))
-            {
-              /* This buffer still sees the default value.  */
-
-              /* If the variable is not local_if_set,
-                 or if this is `let' rather than `set',
-                 make CURRENT-ALIST-ELEMENT point to itself,
-                 indicating that we're seeing the default value.
-                 Likewise if the variable has been let-bound
-                 in the current buffer.  */
-              if (bindflag || !XBUFFER_LOCAL_VALUE (valcontents)->local_if_set
-                  || let_shadows_buffer_binding_p (XSYMBOL (symbol)))
-                {
-                  XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
-
-                  if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-                    tem1 = Fassq (symbol,
-                                  XFRAME (selected_frame)->param_alist);
-
-                  if (! NILP (tem1))
-                    XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1;
-                  else
-                    tem1 = XBUFFER_LOCAL_VALUE (valcontents)->cdr;
-                }
-              /* If it's a Lisp_Buffer_Local_Value, being set not bound,
-                 and we're not within a let that was made for this buffer,
-                 create a new buffer-local binding for the variable.
-                 That means, give this buffer a new assoc for a local value
-                 and load that binding.  */
-              else
-                {
-                  tem1 = Fcons (symbol, XCDR (current_alist_element));
-                  buf->local_var_alist
-                    = Fcons (tem1, buf->local_var_alist);
-                }
-            }
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: SET_SYMBOL_VAL (sym , newval); return;
+    case SYMBOL_LOCALIZED:
+      {
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        if (NILP (where))
+          {
+            if (blv->frame_local)
+              where = selected_frame;
+            else
+              XSETBUFFER (where, current_buffer);
+          }
+        /* If the current buffer is not the buffer whose binding is
+           loaded, or if there may be frame-local bindings and the frame
+           isn't the right one, or if it's a Lisp_Buffer_Local_Value and
+           the default binding is loaded, the loaded binding may be the
+           wrong one.  */
+        if (!EQ (blv->where, where)
+            /* Also unload a global binding (if the var is local_if_set). */
+            || (EQ (blv->valcell, blv->defcell)))
+          {
+            /* The currently loaded binding is not necessarily valid.
+               We need to unload it, and choose a new binding.  */
+
+            /* Write out `realvalue' to the old loaded binding.  */
+            if (blv->fwd)
+              SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
+
+            /* Find the new binding.  */
+            XSETSYMBOL (symbol, sym); /* May have changed via aliasing.  */
+            tem1 = Fassq (symbol,
+                          (blv->frame_local
+                           ? XFRAME (where)->param_alist
+                           : XBUFFER (where)->local_var_alist));
+            blv->where = where;
+            blv->found = 1;
+
+            if (NILP (tem1))
+              {
+                /* This buffer still sees the default value.  */
+
+                /* If the variable is a Lisp_Some_Buffer_Local_Value,
+                   or if this is `let' rather than `set',
+                   make CURRENT-ALIST-ELEMENT point to itself,
+                   indicating that we're seeing the default value.
+                   Likewise if the variable has been let-bound
+                   in the current buffer.  */
+                if (bindflag || !blv->local_if_set
+                    || let_shadows_buffer_binding_p (sym))
+                  {
+                    blv->found = 0;
+                    tem1 = blv->defcell;
+                  }
+                /* If it's a local_if_set, being set not bound,
+                   and we're not within a let that was made for this buffer,
+                   create a new buffer-local binding for the variable.
+                   That means, give this buffer a new assoc for a local value
+                   and load that binding.  */
+                else
+                  {
+                    /* local_if_set is only supported for buffer-local
+                       bindings, not for frame-local bindings.  */
+                    eassert (!blv->frame_local);
+                    tem1 = Fcons (symbol, XCDR (blv->defcell));
+                    XBUFFER (where)->local_var_alist
+                      = Fcons (tem1, XBUFFER (where)->local_var_alist);
+                  }
+              }
+
+            /* Record which binding is now loaded.  */
+            blv->valcell = tem1;
+          }
 
-          /* Record which binding is now loaded.  */
-          XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, tem1);
+        /* Store the new value in the cons cell.  */
+        SET_BLV_VALUE (blv, newval);
 
-          /* Set `buffer' and `frame' slots for the binding now loaded.  */
-          XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf);
-          XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
-        }
-      innercontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue;
+        if (blv->fwd)
+          {
+            if (voide)
+              /* If storing void (making the symbol void), forward only through
+                 buffer-local indicator, not through Lisp_Objfwd, etc.  */
+              blv->fwd = NULL;
+            else
+              store_symval_forwarding (blv->fwd, newval,
+                                       BUFFERP (where)
+                                       ? XBUFFER (where) : current_buffer);
+          }
+        break;
+      }
+    case SYMBOL_FORWARDED:
+      {
+        struct buffer *buf
+          = BUFFERP (where) ? XBUFFER (where) : current_buffer;
+        union Lisp_Fwd *innercontents = SYMBOL_FWD (sym);
+        if (BUFFER_OBJFWDP (innercontents))
+          {
+            int offset = XBUFFER_OBJFWD (innercontents)->offset;
+            int idx = PER_BUFFER_IDX (offset);
+            if (idx > 0
+                && !bindflag
+                && !let_shadows_buffer_binding_p (sym))
+              SET_PER_BUFFER_VALUE_P (buf, idx, 1);
+          }
 
-      /* Store the new value in the cons-cell.  */
-      XSETCDR (XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr), newval);
+        if (voide)
+          { /* If storing void (making the symbol void), forward only through
+               buffer-local indicator, not through Lisp_Objfwd, etc.  */
+            sym->redirect = SYMBOL_PLAINVAL;
+            SET_SYMBOL_VAL (sym, newval);
+          }
+        else
+          store_symval_forwarding (/* sym, */ innercontents, newval, buf);
+        break;
+      }
+    default: abort ();
     }
-
-  /* If storing void (making the symbol void), forward only through
-     buffer-local indicator, not through Lisp_Objfwd, etc.  */
-  if (voide)
-    store_symval_forwarding (symbol, Qnil, newval, buf);
-  else
-    store_symval_forwarding (symbol, innercontents, newval, buf);
-
-  return newval;
+  return;
 }
 
 /* Access or set a buffer-local symbol's default value.  */
@@ -1310,38 +1360,46 @@ Lisp_Object
 default_value (symbol)
      Lisp_Object symbol;
 {
-  register Lisp_Object valcontents;
+  struct Lisp_Symbol *sym;
 
   CHECK_SYMBOL (symbol);
-  valcontents = SYMBOL_VALUE (symbol);
+  sym = XSYMBOL (symbol);
 
-  /* For a built-in buffer-local variable, get the default value
-     rather than letting do_symval_forwarding get the current value.  */
-  if (BUFFER_OBJFWDP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      int offset = XBUFFER_OBJFWD (valcontents)->offset;
-      if (PER_BUFFER_IDX (offset) != 0)
-        return PER_BUFFER_DEFAULT (offset);
-    }
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return SYMBOL_VAL (sym);
+    case SYMBOL_LOCALIZED:
+      {
+        /* If var is set up for a buffer that lacks a local value for it,
+           the current value is nominally the default value.
+           But the `realvalue' slot may be more up to date, since
+           ordinary setq stores just that slot.  So use that.  */
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        if (blv->fwd && EQ (blv->valcell, blv->defcell))
+          return do_symval_forwarding (blv->fwd);
+        else
+          return XCDR (blv->defcell);
+      }
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
 
-  /* Handle user-created local variables.  */
-  if (BUFFER_LOCAL_VALUEP (valcontents))
-    {
-      /* If var is set up for a buffer that lacks a local value for it,
-         the current value is nominally the default value.
-         But the `realvalue' slot may be more up to date, since
-         ordinary setq stores just that slot.  So use that.  */
-      Lisp_Object current_alist_element, alist_element_car;
-      current_alist_element
-        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
-      alist_element_car = XCAR (current_alist_element);
-      if (EQ (alist_element_car, current_alist_element))
-        return do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue);
-      else
-        return XCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
+        /* For a built-in buffer-local variable, get the default value
+           rather than letting do_symval_forwarding get the current value.  */
+        if (BUFFER_OBJFWDP (valcontents))
+          {
+            int offset = XBUFFER_OBJFWD (valcontents)->offset;
+            if (PER_BUFFER_IDX (offset) != 0)
+              return PER_BUFFER_DEFAULT (offset);
+          }
+
+        /* For other variables, get the current value.  */
+        return do_symval_forwarding (valcontents);
+      }
+    default: abort ();
     }
-  /* For other variables, get the current value.  */
-  return do_symval_forwarding (valcontents);
 }
 
 DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0,
@@ -1381,50 +1439,68 @@ for this variable.  */)
      (symbol, value)
      Lisp_Object symbol, value;
 {
-  register Lisp_Object valcontents, current_alist_element, alist_element_buffer;
+  struct Lisp_Symbol *sym;
 
   CHECK_SYMBOL (symbol);
-  valcontents = SYMBOL_VALUE (symbol);
-
-  /* Handle variables like case-fold-search that have special slots
-     in the buffer.  Make them work apparently like Lisp_Buffer_Local_Value
-     variables.  */
-  if (BUFFER_OBJFWDP (valcontents))
+  if (SYMBOL_CONSTANT_P (symbol))
     {
-      int offset = XBUFFER_OBJFWD (valcontents)->offset;
-      int idx = PER_BUFFER_IDX (offset);
+      if (NILP (Fkeywordp (symbol))
+          || !EQ (value, Fdefault_value (symbol)))
+        xsignal1 (Qsetting_constant, symbol);
+      else
+        /* Allow setting keywords to their own value.  */
+        return value;
+    }
+  sym = XSYMBOL (symbol);
 
-      PER_BUFFER_DEFAULT (offset) = value;
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return Fset (symbol, value);
+    case SYMBOL_LOCALIZED:
+      {
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
 
-      /* If this variable is not always local in all buffers,
-         set it in the buffers that don't nominally have a local value.  */
-      if (idx > 0)
-        {
-          struct buffer *b;
+        /* Store new value into the DEFAULT-VALUE slot.  */
+        XSETCDR (blv->defcell, value);
 
-          for (b = all_buffers; b; b = b->next)
-            if (!PER_BUFFER_VALUE_P (b, idx))
-              PER_BUFFER_VALUE (b, offset) = value;
-        }
-      return value;
-    }
+        /* If the default binding is now loaded, set the REALVALUE slot too.  */
+        if (blv->fwd && EQ (blv->defcell, blv->valcell))
+          store_symval_forwarding (blv->fwd, value, NULL);
+        return value;
+      }
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
 
-  if (!BUFFER_LOCAL_VALUEP (valcontents))
-    return Fset (symbol, value);
+        /* Handle variables like case-fold-search that have special slots
+           in the buffer.
+           Make them work apparently like Lisp_Buffer_Local_Value variables.  */
+        if (BUFFER_OBJFWDP (valcontents))
+          {
+            int offset = XBUFFER_OBJFWD (valcontents)->offset;
+            int idx = PER_BUFFER_IDX (offset);
 
-  /* Store new value into the DEFAULT-VALUE slot.  */
-  XSETCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, value);
+            PER_BUFFER_DEFAULT (offset) = value;
 
-  /* If the default binding is now loaded, set the REALVALUE slot too.  */
-  current_alist_element
-    = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
-  alist_element_buffer = Fcar (current_alist_element);
-  if (EQ (alist_element_buffer, current_alist_element))
-    store_symval_forwarding (symbol,
-                             XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
-                             value, NULL);
+            /* If this variable is not always local in all buffers,
+               set it in the buffers that don't nominally have a local value.  */
+            if (idx > 0)
+              {
+                struct buffer *b;
 
-  return value;
+                for (b = all_buffers; b; b = b->next)
+                  if (!PER_BUFFER_VALUE_P (b, idx))
+                    PER_BUFFER_VALUE (b, offset) = value;
+              }
+            return value;
+          }
+        else
+          return Fset (symbol, value);
+      }
+    default: abort ();
+    }
 }
 
 DEFUN ("setq-default", Fsetq_default, Ssetq_default, 0, UNEVALLED, 0,
@@ -1468,6 +1544,39 @@ usage: (setq-default [VAR VALUE]...)  */)
 
 /* Lisp functions for creating and removing buffer-local variables.  */
 
+union Lisp_Val_Fwd
+  {
+    Lisp_Object value;
+    union Lisp_Fwd *fwd;
+  };
+
+static struct Lisp_Buffer_Local_Value *
+make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents)
+{
+  struct Lisp_Buffer_Local_Value *blv
+    = xmalloc (sizeof (struct Lisp_Buffer_Local_Value));
+  Lisp_Object symbol;
+  Lisp_Object tem;
+
+ XSETSYMBOL (symbol, sym);
+ tem = Fcons (symbol, (forwarded
+                       ? do_symval_forwarding (valcontents.fwd)
+                       : valcontents.value));
+
+  /* Buffer_Local_Values cannot have as realval a buffer-local
+     or keyboard-local forwarding.  */
+  eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd)));
+  eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd)));
+  blv->fwd = forwarded ? valcontents.fwd : NULL;
+  blv->where = Qnil;
+  blv->frame_local = 0;
+  blv->local_if_set = 0;
+  blv->defcell = tem;
+  blv->valcell = tem;
+  SET_BLV_FOUND (blv, 0);
+  return blv;
+}
+
 DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local,
        1, 1, "vMake Variable Buffer Local: ",
        doc: /* Make VARIABLE become buffer-local whenever it is set.
@@ -1485,42 +1594,58 @@ The function `default-value' gets the default value and `set-default' sets it.
      (variable)
      register Lisp_Object variable;
 {
-  register Lisp_Object tem, valcontents, newval;
   struct Lisp_Symbol *sym;
+  struct Lisp_Buffer_Local_Value *blv = NULL;
+  union Lisp_Val_Fwd valcontents;
+  int forwarded;
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
+  sym = XSYMBOL (variable);
 
-  valcontents = sym->value;
-  if (sym->constant || KBOARD_OBJFWDP (valcontents))
-    error ("Symbol %s may not be buffer-local", SDATA (sym->xname));
-
-  if (BUFFER_OBJFWDP (valcontents))
-    return variable;
-  else if (BUFFER_LOCAL_VALUEP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-        error ("Symbol %s may not be buffer-local", SDATA (sym->xname));
-      newval = valcontents;
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL:
+      forwarded = 0; valcontents.value = SYMBOL_VAL (sym);
+      if (EQ (valcontents.value, Qunbound))
+        valcontents.value = Qnil;
+      break;
+    case SYMBOL_LOCALIZED:
+      blv = SYMBOL_BLV (sym);
+      if (blv->frame_local)
+        error ("Symbol %s may not be buffer-local",
+               SDATA (SYMBOL_NAME (variable)));
+      break;
+    case SYMBOL_FORWARDED:
+      forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym);
+      if (KBOARD_OBJFWDP (valcontents.fwd))
+        error ("Symbol %s may not be buffer-local",
+               SDATA (SYMBOL_NAME (variable)));
+      else if (BUFFER_OBJFWDP (valcontents.fwd))
+        return variable;
+      break;
+    default: abort ();
     }
-  else
+
+  if (sym->constant)
+    error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable)));
+
+  if (!blv)
     {
-      if (EQ (valcontents, Qunbound))
-        sym->value = Qnil;
-      tem = Fcons (Qnil, Fsymbol_value (variable));
-      XSETCAR (tem, tem);
-      newval = allocate_misc ();
-      XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
-      XBUFFER_LOCAL_VALUE (newval)->realvalue = sym->value;
-      XBUFFER_LOCAL_VALUE (newval)->buffer = Fcurrent_buffer ();
-      XBUFFER_LOCAL_VALUE (newval)->frame = Qnil;
-      XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0;
-      XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0;
-      XBUFFER_LOCAL_VALUE (newval)->check_frame = 0;
-      XBUFFER_LOCAL_VALUE (newval)->cdr = tem;
-      sym->value = newval;
+      blv = make_blv (sym, forwarded, valcontents);
+      sym->redirect = SYMBOL_LOCALIZED;
+      SET_SYMBOL_BLV (sym, blv);
+      {
+        Lisp_Object symbol;
+        XSETSYMBOL (symbol, sym); /* In case `variable' is aliased.  */
+        if (let_shadows_global_binding_p (symbol))
+          message ("Making %s buffer-local while let-bound!",
+                   SDATA (SYMBOL_NAME (variable)));
+      }
     }
-  XBUFFER_LOCAL_VALUE (newval)->local_if_set = 1;
+
+  blv->local_if_set = 1;
   return variable;
 }
 
@@ -1547,82 +1672,97 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
      (variable)
      register Lisp_Object variable;
 {
-  register Lisp_Object tem, valcontents;
+  register Lisp_Object tem;
+  int forwarded;
+  union Lisp_Val_Fwd valcontents;
   struct Lisp_Symbol *sym;
+  struct Lisp_Buffer_Local_Value *blv = NULL;
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
+  sym = XSYMBOL (variable);
+
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL:
+      forwarded = 0; valcontents.value = SYMBOL_VAL (sym); break;
+    case SYMBOL_LOCALIZED:
+      blv = SYMBOL_BLV (sym);
+      if (blv->frame_local)
+        error ("Symbol %s may not be buffer-local",
+               SDATA (SYMBOL_NAME (variable)));
+      break;
+    case SYMBOL_FORWARDED:
+      forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym);
+      if (KBOARD_OBJFWDP (valcontents.fwd))
+        error ("Symbol %s may not be buffer-local",
+               SDATA (SYMBOL_NAME (variable)));
+      break;
+    default: abort ();
+    }
 
-  valcontents = sym->value;
-  if (sym->constant || KBOARD_OBJFWDP (valcontents)
-      || (BUFFER_LOCAL_VALUEP (valcontents)
-          && (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)))
-    error ("Symbol %s may not be buffer-local", SDATA (sym->xname));
+  if (sym->constant)
+    error ("Symbol %s may not be buffer-local",
+           SDATA (SYMBOL_NAME (variable)));
 
-  if ((BUFFER_LOCAL_VALUEP (valcontents)
-       && XBUFFER_LOCAL_VALUE (valcontents)->local_if_set)
-      || BUFFER_OBJFWDP (valcontents))
+  if (blv ? blv->local_if_set
+      : (forwarded && BUFFER_OBJFWDP (valcontents.fwd)))
     {
       tem = Fboundp (variable);
-
       /* Make sure the symbol has a local value in this particular buffer,
          by setting it to the same value it already has.  */
       Fset (variable, (EQ (tem, Qt) ? Fsymbol_value (variable) : Qunbound));
       return variable;
     }
-  /* Make sure symbol is set up to hold per-buffer values.  */
-  if (!BUFFER_LOCAL_VALUEP (valcontents))
+  if (!blv)
     {
-      Lisp_Object newval;
-      tem = Fcons (Qnil, do_symval_forwarding (valcontents));
-      XSETCAR (tem, tem);
-      newval = allocate_misc ();
-      XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
-      XBUFFER_LOCAL_VALUE (newval)->realvalue = sym->value;
-      XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil;
-      XBUFFER_LOCAL_VALUE (newval)->frame = Qnil;
-      XBUFFER_LOCAL_VALUE (newval)->local_if_set = 0;
-      XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0;
-      XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0;
-      XBUFFER_LOCAL_VALUE (newval)->check_frame = 0;
-      XBUFFER_LOCAL_VALUE (newval)->cdr = tem;
-      sym->value = newval;
+      blv = make_blv (sym, forwarded, valcontents);
+      sym->redirect = SYMBOL_LOCALIZED;
+      SET_SYMBOL_BLV (sym, blv);
+      {
+        Lisp_Object symbol;
+        XSETSYMBOL (symbol, sym); /* In case `variable' is aliased.  */
+        if (let_shadows_global_binding_p (symbol))
+          message ("Making %s local to %s while let-bound!",
+                   SDATA (SYMBOL_NAME (variable)),
+                   SDATA (current_buffer->name));
+      }
     }
+
   /* Make sure this buffer has its own value of symbol.  */
-  XSETSYMBOL (variable, sym);   /* Propagate variable indirections.  */
+  XSETSYMBOL (variable, sym);   /* Update in case of aliasing.  */
   tem = Fassq (variable, current_buffer->local_var_alist);
   if (NILP (tem))
     {
+      if (let_shadows_buffer_binding_p (sym))
+        message ("Making %s buffer-local while locally let-bound!",
+                 SDATA (SYMBOL_NAME (variable)));
+
       /* Swap out any local binding for some other buffer, and make
          sure the current value is permanently recorded, if it's the
          default value.  */
       find_symbol_value (variable);
 
       current_buffer->local_var_alist
-        = Fcons (Fcons (variable, XCDR (XBUFFER_LOCAL_VALUE (sym->value)->cdr)),
+        = Fcons (Fcons (variable, XCDR (blv->defcell)),
                  current_buffer->local_var_alist);
 
       /* Make sure symbol does not think it is set up for this buffer;
          force it to look once again for this buffer's value.  */
-      {
-        Lisp_Object *pvalbuf;
-
-        valcontents = sym->value;
-
-        pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer;
-        if (current_buffer == XBUFFER (*pvalbuf))
-          *pvalbuf = Qnil;
-        XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
-      }
+      if (current_buffer == XBUFFER (blv->where))
+        blv->where = Qnil;
+      /* blv->valcell = blv->defcell;
+       * SET_BLV_FOUND (blv, 0); */
+      blv->found = 0;
     }
 
   /* If the symbol forwards into a C variable, then load the binding
      for this buffer now.  If C code modifies the variable before we
      load the binding in, then that new value will clobber the default
      binding the next time we unload it.  */
-  valcontents = XBUFFER_LOCAL_VALUE (sym->value)->realvalue;
-  if (INTFWDP (valcontents) || BOOLFWDP (valcontents) || OBJFWDP (valcontents))
-    swap_in_symval_forwarding (variable, sym->value);
+  if (blv->fwd)
+    swap_in_symval_forwarding (sym, blv);
 
   return variable;
 }
@@ -1634,31 +1774,43 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
      (variable)
      register Lisp_Object variable;
 {
-  register Lisp_Object tem, valcontents;
+  register Lisp_Object tem;
+  struct Lisp_Buffer_Local_Value *blv;
   struct Lisp_Symbol *sym;
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
-
-  valcontents = sym->value;
+  sym = XSYMBOL (variable);
 
-  if (BUFFER_OBJFWDP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      int offset = XBUFFER_OBJFWD (valcontents)->offset;
-      int idx = PER_BUFFER_IDX (offset);
-
-      if (idx > 0)
-        {
-          SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0);
-          PER_BUFFER_VALUE (current_buffer, offset)
-            = PER_BUFFER_DEFAULT (offset);
-        }
-      return variable;
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return variable;
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
+        if (BUFFER_OBJFWDP (valcontents))
+          {
+            int offset = XBUFFER_OBJFWD (valcontents)->offset;
+            int idx = PER_BUFFER_IDX (offset);
+
+            if (idx > 0)
+              {
+                SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0);
+                PER_BUFFER_VALUE (current_buffer, offset)
+                  = PER_BUFFER_DEFAULT (offset);
+              }
+          }
+        return variable;
+      }
+    case SYMBOL_LOCALIZED:
+      blv = SYMBOL_BLV (sym);
+      if (blv->frame_local)
+        return variable;
+      break;
+    default: abort ();
     }
 
-  if (!BUFFER_LOCAL_VALUEP (valcontents))
-    return variable;
-
   /* Get rid of this buffer's alist element, if any.  */
   XSETSYMBOL (variable, sym);   /* Propagate variable indirection.  */
   tem = Fassq (variable, current_buffer->local_var_alist);
@@ -1670,14 +1822,13 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
      loaded, recompute its value.  We have to do it now, or else
      forwarded objects won't work right.  */
   {
-    Lisp_Object *pvalbuf, buf;
-    valcontents = sym->value;
-    pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer;
-    XSETBUFFER (buf, current_buffer);
-    if (EQ (buf, *pvalbuf))
+    Lisp_Object buf; XSETBUFFER (buf, current_buffer);
+    if (EQ (buf, blv->where))
       {
-        *pvalbuf = Qnil;
-        XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
+        blv->where = Qnil;
+        /* blv->valcell = blv->defcell;
+         * SET_BLV_FOUND (blv, 0); */
+        blv->found = 0;
         find_symbol_value (variable);
       }
   }
@@ -1712,39 +1863,52 @@ frame-local bindings).  */)
      (variable)
      register Lisp_Object variable;
 {
-  register Lisp_Object tem, valcontents, newval;
+  int forwarded;
+  union Lisp_Val_Fwd valcontents;
   struct Lisp_Symbol *sym;
+  struct Lisp_Buffer_Local_Value *blv = NULL;
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
+  sym = XSYMBOL (variable);
 
-  valcontents = sym->value;
-  if (sym->constant || KBOARD_OBJFWDP (valcontents)
-      || BUFFER_OBJFWDP (valcontents))
-    error ("Symbol %s may not be frame-local", SDATA (sym->xname));
-
-  if (BUFFER_LOCAL_VALUEP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      if (!XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-        error ("Symbol %s may not be frame-local", SDATA (sym->xname));
-      return variable;
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL:
+      forwarded = 0; valcontents.value = SYMBOL_VAL (sym);
+      if (EQ (valcontents.value, Qunbound))
+        valcontents.value = Qnil;
+      break;
+    case SYMBOL_LOCALIZED:
+      if (SYMBOL_BLV (sym)->frame_local)
+        return variable;
+      else
+        error ("Symbol %s may not be frame-local",
+               SDATA (SYMBOL_NAME (variable)));
+    case SYMBOL_FORWARDED:
+      forwarded = 1; valcontents.fwd = SYMBOL_FWD (sym);
+      if (KBOARD_OBJFWDP (valcontents.fwd) || BUFFER_OBJFWDP (valcontents.fwd))
+        error ("Symbol %s may not be frame-local",
+               SDATA (SYMBOL_NAME (variable)));
+      break;
+    default: abort ();
     }
 
-  if (EQ (valcontents, Qunbound))
-    sym->value = Qnil;
-  tem = Fcons (Qnil, Fsymbol_value (variable));
-  XSETCAR (tem, tem);
-  newval = allocate_misc ();
-  XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
-  XBUFFER_LOCAL_VALUE (newval)->realvalue = sym->value;
-  XBUFFER_LOCAL_VALUE (newval)->buffer = Qnil;
-  XBUFFER_LOCAL_VALUE (newval)->frame = Qnil;
-  XBUFFER_LOCAL_VALUE (newval)->local_if_set = 0;
-  XBUFFER_LOCAL_VALUE (newval)->found_for_buffer = 0;
-  XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0;
-  XBUFFER_LOCAL_VALUE (newval)->check_frame = 1;
-  XBUFFER_LOCAL_VALUE (newval)->cdr = tem;
-  sym->value = newval;
+  if (sym->constant)
+    error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable)));
+
+  blv = make_blv (sym, forwarded, valcontents);
+  blv->frame_local = 1;
+  sym->redirect = SYMBOL_LOCALIZED;
+  SET_SYMBOL_BLV (sym, blv);
+  {
+    Lisp_Object symbol;
+    XSETSYMBOL (symbol, sym); /* In case `variable' is aliased.  */
+    if (let_shadows_global_binding_p (symbol))
+      message ("Making %s frame-local while let-bound!",
+               SDATA (SYMBOL_NAME (variable)));
+  }
   return variable;
 }
 
@@ -1755,7 +1919,6 @@ BUFFER defaults to the current buffer.  */)
      (variable, buffer)
      register Lisp_Object variable, buffer;
 {
-  Lisp_Object valcontents;
   register struct buffer *buf;
   struct Lisp_Symbol *sym;
 
@@ -1768,29 +1931,46 @@ BUFFER defaults to the current buffer.  */)
     }
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
-  XSETSYMBOL (variable, sym);
+  sym = XSYMBOL (variable);
 
-  valcontents = sym->value;
-  if (BUFFER_LOCAL_VALUEP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      Lisp_Object tail, elt;
-
-      for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
-        {
-          elt = XCAR (tail);
-          if (EQ (variable, XCAR (elt)))
-            return Qt;
-        }
-    }
-  if (BUFFER_OBJFWDP (valcontents))
-    {
-      int offset = XBUFFER_OBJFWD (valcontents)->offset;
-      int idx = PER_BUFFER_IDX (offset);
-      if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
-        return Qt;
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return Qnil;
+    case SYMBOL_LOCALIZED:
+      {
+        Lisp_Object tail, elt, tmp;
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        XSETBUFFER (tmp, buf);
+        
+        for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
+          {
+            elt = XCAR (tail);
+            if (EQ (variable, XCAR (elt)))
+              {
+                eassert (!blv->frame_local);
+                eassert (BLV_FOUND (blv) || !EQ (blv->where, tmp));
+                return Qt;
+              }
+          }
+        eassert (!BLV_FOUND (blv) || !EQ (blv->where, tmp));
+        return Qnil;
+      }
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
+        if (BUFFER_OBJFWDP (valcontents))
+          {
+            int offset = XBUFFER_OBJFWD (valcontents)->offset;
+            int idx = PER_BUFFER_IDX (offset);
+            if (idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
+              return Qt;
+          }
+        return Qnil;
+      }
+    default: abort ();
     }
-  return Qnil;
 }
 
 DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p,
@@ -1804,40 +1984,29 @@ BUFFER defaults to the current buffer.  */)
      (variable, buffer)
      register Lisp_Object variable, buffer;
 {
-  Lisp_Object valcontents;
-  register struct buffer *buf;
   struct Lisp_Symbol *sym;
 
-  if (NILP (buffer))
-    buf = current_buffer;
-  else
-    {
-      CHECK_BUFFER (buffer);
-      buf = XBUFFER (buffer);
-    }
-
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
-  XSETSYMBOL (variable, sym);
+  sym = XSYMBOL (variable);
 
-  valcontents = sym->value;
-
-  if (BUFFER_OBJFWDP (valcontents))
-    /* All these slots become local if they are set.  */
-    return Qt;
-  else if (BUFFER_LOCAL_VALUEP (valcontents))
+ start:
+  switch (sym->redirect)
     {
-      Lisp_Object tail, elt;
-      if (XBUFFER_LOCAL_VALUE (valcontents)->local_if_set)
-        return Qt;
-      for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
-        {
-          elt = XCAR (tail);
-          if (EQ (variable, XCAR (elt)))
-            return Qt;
-        }
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return Qnil;
+    case SYMBOL_LOCALIZED:
+      {
+        struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
+        if (blv->local_if_set)
+          return Qt;
+        XSETSYMBOL (variable, sym); /* Update in case of aliasing.  */
+        return Flocal_variable_p (variable, buffer);
+      }
+    case SYMBOL_FORWARDED:
+      /* All BUFFER_OBJFWD slots become local if they are set.  */
+      return (BUFFER_OBJFWDP (SYMBOL_FWD (sym)) ? Qt : Qnil);
+    default: abort ();
     }
-  return Qnil;
 }
 
 DEFUN ("variable-binding-locus", Fvariable_binding_locus, Svariable_binding_locus,
@@ -1849,30 +2018,40 @@ If the current binding is global (the default), the value is nil.  */)
      (variable)
      register Lisp_Object variable;
 {
-  Lisp_Object valcontents;
   struct Lisp_Symbol *sym;
 
   CHECK_SYMBOL (variable);
-  sym = indirect_variable (XSYMBOL (variable));
+  sym = XSYMBOL (variable);
 
   /* Make sure the current binding is actually swapped in.  */
   find_symbol_value (variable);
 
-  valcontents = sym->value;
-
-  if (BUFFER_LOCAL_VALUEP (valcontents)
-      || BUFFER_OBJFWDP (valcontents))
+ start:
+  switch (sym->redirect)
     {
+    case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+    case SYMBOL_PLAINVAL: return Qnil;
+    case SYMBOL_FORWARDED:
+      {
+        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
+        if (KBOARD_OBJFWDP (valcontents))
+          return Fframe_terminal (Fselected_frame ());
+        else if (!BUFFER_OBJFWDP (valcontents))
+          return Qnil;
+      }
+      /* FALLTHROUGH */
+    case SYMBOL_LOCALIZED:
       /* For a local variable, record both the symbol and which
          buffer's or frame's value we are saving.  */
       if (!NILP (Flocal_variable_p (variable, Qnil)))
         return Fcurrent_buffer ();
-      else if (BUFFER_LOCAL_VALUEP (valcontents)
-               && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame)
-        return XBUFFER_LOCAL_VALUE (valcontents)->frame;
+      else if (sym->redirect == SYMBOL_LOCALIZED
+               && BLV_FOUND (SYMBOL_BLV (sym)))
+        return SYMBOL_BLV (sym)->where;
+      else
+        return Qnil;
+    default: abort ();
     }
-
-  return Qnil;
 }
 
 /* This code is disabled now that we use the selected frame to return
diff --git a/src/dired.c b/src/dired.c
index 2240f6ec76e..a3ea23df2f6 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -935,9 +935,9 @@ DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0,
 Value is nil if specified file cannot be opened.
 
 ID-FORMAT specifies the preferred format of attributes uid and gid (see
-below) - valid values are 'string and 'integer. The latter is the default,
-but we plan to change that, so you should specify a non-nil value for
-ID-FORMAT if you use the returned uid or gid.
+below) - valid values are 'string and 'integer.  The latter is the
+default, but we plan to change that, so you should specify a non-nil value
+for ID-FORMAT if you use the returned uid or gid.
 
 Elements of the attribute list are:
  0. t for directory, string (name linked to) for symbolic link, or nil.
diff --git a/src/dispextern.h b/src/dispextern.h
index 00da256c43e..72c0b2ef414 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1956,6 +1956,7 @@ enum it_method {
   NUM_IT_METHODS
 };
 
+/* FIXME: What is this?  Why 5?  */
 #define IT_STACK_SIZE 5
 
 /* Iterator for composition (both for static and automatic).  */
@@ -2222,13 +2223,22 @@ struct it
      MODE_LINE_FACE_ID, etc, depending on what we are displaying.  */
   int base_face_id;
 
-  /* If what == IT_CHARACTER, character and length in bytes.  This is
-     a character from a buffer or string.  It may be different from
-     the character displayed in case that
-     unibyte_display_via_language_environment is set.
+  /* If `what' == IT_CHARACTER, the character and the length in bytes
+     of its multibyte sequence.  The character comes from a buffer or
+     a string.  It may be different from the character displayed in
+     case that unibyte_display_via_language_environment is set.
 
-     If what == IT_COMPOSITION, the first component of a composition
-     and length in bytes of the composition.  */
+     If `what' == IT_COMPOSITION, the first component of a composition
+     and length in bytes of the composition.
+
+     If `what' is anything else, these two are undefined (will
+     probably hold values for the last IT_CHARACTER or IT_COMPOSITION
+     traversed by the iterator.
+
+     The values are updated by get_next_display_element, so they are
+     out of sync with the value returned by IT_CHARPOS between the
+     time set_iterator_to_next advances the position and the time
+     get_next_display_element loads the new values into c and len.  */
   int c, len;
 
   /* If what == IT_COMPOSITION, iterator substructure for the
@@ -2783,6 +2793,9 @@ enum tool_bar_item_idx
   /* Icon file name of right to left image when an RTL locale is used.  */
   TOOL_BAR_ITEM_RTL_IMAGE,
 
+  /* Label to show when text labels are enabled.  */
+  TOOL_BAR_ITEM_LABEL,
+
   /* Sentinel = number of slots in tool_bar_items occupied by one
      tool-bar item.  */
   TOOL_BAR_ITEM_NSLOTS
@@ -2804,6 +2817,15 @@ enum tool_bar_item_image
 
 extern Lisp_Object Vtool_bar_button_margin;
 
+/* Tool bar style */
+
+extern Lisp_Object Vtool_bar_style;
+
+/* Maximum number of characters a label can have to be shown.  */
+
+extern EMACS_INT tool_bar_max_label_size;
+#define DEFAULT_TOOL_BAR_LABEL_SIZE 14
+
 /* Thickness of relief to draw around tool-bar buttons.  */
 
 extern EMACS_INT tool_bar_button_relief;
diff --git a/src/dispnew.c b/src/dispnew.c
index 2be00c9c3b0..7ab2bf35811 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4251,7 +4251,9 @@ update_text_area (w, vpos)
              doesn't work with lbearing/rbearing), so we must do it
              this way.  */
           if (vpos == w->phys_cursor.vpos
-              && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA])
+              && (desired_row->reversed_p
+                  ? (w->phys_cursor.hpos < 0)
+                  : (w->phys_cursor.hpos >= desired_row->used[TEXT_AREA])))
             {
               w->phys_cursor_on_p = 0;
               x = -1;
@@ -4415,7 +4417,7 @@ set_window_cursor_after_update (w)
     }
 
   /* Window cursor can be out of sync for horizontally split windows.  */
-  hpos = max (0, hpos);
+  hpos = max (-1, hpos); /* -1 is for when cursor is on the left fringe */
   hpos = min (w->current_matrix->matrix_w - 1, hpos);
   vpos = max (0, vpos);
   vpos = min (w->current_matrix->nrows - 1, vpos);
diff --git a/src/doc.c b/src/doc.c
index 303aed0486d..536d22c57a6 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -538,7 +538,7 @@ store_function_docstring (fun, offset)
         {
           tem = Fcdr (Fcdr (fun));
           if (CONSP (tem) && INTEGERP (XCAR (tem)))
-            XSETCARFASTINT (tem, offset);
+            XSETCAR (tem, make_number (offset));
         }
       else if (EQ (tem, Qmacro))
         store_function_docstring (XCDR (fun), offset);
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 0d7d26d3685..458771319c7 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -61,15 +61,7 @@ int data_start = 0;
 
 char **environ;
 
-#ifndef static
-/* On systems where the static storage class is usable, this function
-   should be declared as static.  Otherwise, the static keyword has
-   been defined to be something else, and code for those systems must
-   take care of this declaration appropriately.  */
 static start1 ();
-#endif
-
-#ifdef CRT0_DUMMIES
 
 /* Define symbol "start": here; some systems want that symbol.  */
 asm("   .text           ");
@@ -83,7 +75,7 @@ _start ()
 }
 
 static
-start1 (CRT0_DUMMIES argc, xargv)
+start1 (bogus_fp, argc, xargv)
      int argc;
      char *xargv;
 {
@@ -98,7 +90,6 @@ start1 (CRT0_DUMMIES argc, xargv)
      and optimize it out.  */
   (void) &start1;
 }
-#endif /* CRT0_DUMMIES */
 
 /* arch-tag: 4025c2fb-d6b1-4d29-b1b6-8100b6bd1e74
    (do not change this comment) */
diff --git a/src/emacs.c b/src/emacs.c
index 400a6b0e594..6b19b45d0b0 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -81,7 +81,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef HAVE_SETPGID
-#if !defined (USG) || defined (BSD_PGRPS)
+#if !defined (USG)
 #undef setpgrp
 #define setpgrp setpgid
 #endif
@@ -193,11 +193,6 @@ EMACS_INT emacs_priority;
    data on the first attempt to change it inside asynchronous code.  */
 int running_asynch_code;
 
-#ifdef BSD_PGRPS
-/* See sysdep.c.  */
-extern int inherited_pgroup;
-#endif
-
 #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
 /* If non-zero, -d was specified, meaning we're using some window system.  */
 int display_arg;
@@ -268,6 +263,7 @@ read the main documentation for these command-line arguments.\n\
 Initialization options:\n\
 \n\
 --batch                     do not do interactive display; implies -q\n\
+--chdir DIR                 change to directory DIR\n\
 --daemon                    start a server in the background\n\
 --debug-init                enable Emacs Lisp debugger for init file\n\
 --display, -d DISPLAY       use X server DISPLAY\n\
@@ -385,6 +381,9 @@ fatal_error_signal (sig)
     {
       fatal_error_in_progress = 1;
 
+      if (sig == SIGTERM || sig == SIGHUP)
+        Fkill_emacs (make_number (sig));
+
       shut_down_emacs (sig, 0, Qnil);
     }
 
@@ -765,6 +764,7 @@ main (int argc, char **argv)
 #ifdef NS_IMPL_COCOA
   char dname_arg2[80];
 #endif
+  char *ch_to_dir;
 
 #if GC_MARK_STACK
   extern Lisp_Object *stack_base;
@@ -832,6 +832,14 @@ main (int argc, char **argv)
           exit (0);
         }
     }
+  if (argmatch (argv, argc, "-chdir", "--chdir", 2, &ch_to_dir, &skip_args))
+      if (chdir (ch_to_dir) == -1)
+        {
+          fprintf (stderr, "%s: Can't chdir to %s: %s\n",
+                   argv[0], ch_to_dir, strerror (errno));
+          exit (1);
+        }
+
 
 #ifdef HAVE_PERSONALITY_LINUX32
   if (!initialized
@@ -1174,17 +1182,9 @@ main (int argc, char **argv)
 
   if (! noninteractive)
     {
-#ifdef BSD_PGRPS
-      if (initialized)
-        {
-          inherited_pgroup = EMACS_GETPGRP (0);
-          setpgrp (0, getpid ());
-        }
-#else
 #if defined (USG5) && defined (INTERRUPT_INPUT)
       setpgrp ();
 #endif
-#endif
 #if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
       {
         extern void malloc_enable_thread P_ ((void));
@@ -1582,9 +1582,7 @@ main (int argc, char **argv)
       syms_of_ccl ();
       syms_of_character ();
       syms_of_cmds ();
-#ifndef NO_DIR_LIBRARY
       syms_of_dired ();
-#endif /* not NO_DIR_LIBRARY */
       syms_of_display ();
       syms_of_doc ();
       syms_of_editfns ();
@@ -1802,6 +1800,7 @@ struct standard_args
 const struct standard_args standard_args[] =
 {
   { "-version", "--version", 150, 0 },
+  { "-chdir", "--chdir", 130, 1 },
   { "-t", "--terminal", 120, 1 },
   { "-nw", "--no-window-system", 110, 0 },
   { "-nw", "--no-windows", 110, 0 },
diff --git a/src/eval.c b/src/eval.c
index 6609d3b5c8a..2a0330acc38 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "commands.h"
 #include "keyboard.h"
 #include "dispextern.h"
+#include "frame.h"              /* For XFRAME.  */
 
 #if HAVE_X_WINDOWS
 #include "xterm.h"
@@ -767,24 +768,43 @@ The return value is BASE-VARIABLE.  */)
   CHECK_SYMBOL (new_alias);
   CHECK_SYMBOL (base_variable);
 
-  if (SYMBOL_CONSTANT_P (new_alias))
+  sym = XSYMBOL (new_alias);
+
+  if (sym->constant)
+    /* Not sure why, but why not?  */
     error ("Cannot make a constant an alias");
 
-  sym = XSYMBOL (new_alias);
+  switch (sym->redirect)
+    {
+    case SYMBOL_FORWARDED:
+      error ("Cannot make an internal variable an alias");
+    case SYMBOL_LOCALIZED:
+      error ("Don't know how to make a localized variable an alias");
+    }
+
   /* http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg00834.html
-     If n_a is bound, but b_v is not, set the value of b_v to n_a.
-     This is for the sake of define-obsolete-variable-alias and user
-     customizations.  */
-  if (NILP (Fboundp (base_variable)) && !NILP (Fboundp (new_alias)))
-    XSYMBOL(base_variable)->value = sym->value;
-  sym->indirect_variable = 1;
-  sym->value = base_variable;
+     If n_a is bound, but b_v is not, set the value of b_v to n_a,
+     so that old-code that affects n_a before the aliasing is setup
+     still works.  */
+  if (NILP (Fboundp (base_variable)))
+    set_internal (base_variable, find_symbol_value (new_alias), Qnil, 1);
+
+  {
+    struct specbinding *p;
+
+    for (p = specpdl_ptr - 1; p >= specpdl; p--)
+      if (p->func == NULL
+          && (EQ (new_alias,
+                  CONSP (p->symbol) ? XCAR (p->symbol) : p->symbol)))
+        error ("Don't know how to make a let-bound variable an alias");
+  }
+
+  sym->redirect = SYMBOL_VARALIAS;
+  SET_SYMBOL_ALIAS (sym, XSYMBOL (base_variable));
   sym->constant = SYMBOL_CONSTANT_P (base_variable);
   LOADHIST_ATTACH (new_alias);
-  if (!NILP (docstring))
-    Fput (new_alias, Qvariable_documentation, docstring);
-  else
-    Fput (new_alias, Qvariable_documentation, Qnil);
+  /* Even if docstring is nil: remove old docstring.  */
+  Fput (new_alias, Qvariable_documentation, docstring);
 
   return base_variable;
 }
@@ -944,7 +964,7 @@ chain of symbols.  */)
       return Qnil;
 
   /* If indirect and there's an alias loop, don't check anything else.  */
-  if (XSYMBOL (variable)->indirect_variable
+  if (XSYMBOL (variable)->redirect == SYMBOL_VARALIAS
       && NILP (internal_condition_case_1 (lisp_indirect_variable, variable,
                                           Qt, user_variable_p_eh)))
     return Qnil;
@@ -968,11 +988,11 @@ chain of symbols.  */)
           || (!NILP (Fget (variable, intern ("custom-autoload")))))
         return Qt;
 
-      if (!XSYMBOL (variable)->indirect_variable)
+      if (!(XSYMBOL (variable)->redirect == SYMBOL_VARALIAS))
         return Qnil;
 
       /* An indirect variable?  Let's follow the chain.  */
-      variable = XSYMBOL (variable)->value;
+      XSETSYMBOL (variable, SYMBOL_ALIAS (XSYMBOL (variable)));
     }
 }
 
@@ -1541,17 +1561,64 @@ internal_condition_case_1 (bfun, arg, handlers, hfun)
   return val;
 }
 
+/* Like internal_condition_case_1 but call BFUN with ARG1 and ARG2 as
+   its arguments.  */
+
+Lisp_Object
+internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object),
+                           Lisp_Object arg1,
+                           Lisp_Object arg2,
+                           Lisp_Object handlers,
+                           Lisp_Object (*hfun) (Lisp_Object))
+{
+  Lisp_Object val;
+  struct catchtag c;
+  struct handler h;
+
+  /* Since Fsignal will close off all calls to x_catch_errors,
+     we will get the wrong results if some are not closed now.  */
+#if HAVE_X_WINDOWS
+  if (x_catching_errors ())
+    abort ();
+#endif
+
+  c.tag = Qnil;
+  c.val = Qnil;
+  c.backlist = backtrace_list;
+  c.handlerlist = handlerlist;
+  c.lisp_eval_depth = lisp_eval_depth;
+  c.pdlcount = SPECPDL_INDEX ();
+  c.poll_suppress_count = poll_suppress_count;
+  c.interrupt_input_blocked = interrupt_input_blocked;
+  c.gcpro = gcprolist;
+  c.byte_stack = byte_stack_list;
+  if (_setjmp (c.jmp))
+    {
+      return (*hfun) (c.val);
+    }
+  c.next = catchlist;
+  catchlist = &c;
+  h.handler = handlers;
+  h.var = Qnil;
+  h.next = handlerlist;
+  h.tag = &c;
+  handlerlist = &h;
+
+  val = (*bfun) (arg1, arg2);
+  catchlist = c.next;
+  handlerlist = h.next;
+  return val;
+}
 
 /* Like internal_condition_case but call BFUN with NARGS as first,
    and ARGS as second argument.  */
 
 Lisp_Object
-internal_condition_case_2 (bfun, nargs, args, handlers, hfun)
-     Lisp_Object (*bfun) ();
-     int nargs;
-     Lisp_Object *args;
-     Lisp_Object handlers;
-     Lisp_Object (*hfun) ();
+internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*),
+                           int nargs,
+                           Lisp_Object *args,
+                           Lisp_Object handlers,
+                           Lisp_Object (*hfun) (Lisp_Object))
 {
   Lisp_Object val;
   struct catchtag c;
@@ -2112,8 +2179,6 @@ this does nothing and returns nil.  */)
      (function, file, docstring, interactive, type)
      Lisp_Object function, file, docstring, interactive, type;
 {
-  Lisp_Object args[4];
-
   CHECK_SYMBOL (function);
   CHECK_STRING (file);
 
@@ -2129,8 +2194,11 @@ this does nothing and returns nil.  */)
     LOADHIST_ATTACH (Fcons (Qautoload, function));
   else
     /* We don't want the docstring in purespace (instead,
-       Snarf-documentation should (hopefully) overwrite it).  */
-    docstring = make_number (0);
+       Snarf-documentation should (hopefully) overwrite it).
+       We used to use 0 here, but that leads to accidental sharing in
+       purecopy's hash-consing, so we use a (hopefully) unique integer
+       instead.  */
+    docstring = make_number (XHASH (function));
   return Ffset (function,
                 Fpurecopy (list5 (Qautoload, file, docstring,
                                   interactive, type)));
@@ -2764,7 +2832,6 @@ apply1 (fn, arg)
   if (NILP (arg))
     RETURN_UNGCPRO (Ffuncall (1, &fn));
   gcpro1.nvars = 2;
-#ifdef NO_ARG_ARRAY
   {
     Lisp_Object args[2];
     args[0] = fn;
@@ -2772,9 +2839,6 @@ apply1 (fn, arg)
     gcpro1.var = args;
     RETURN_UNGCPRO (Fapply (2, args));
   }
-#else /* not NO_ARG_ARRAY */
-  RETURN_UNGCPRO (Fapply (2, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn on no arguments */
@@ -2795,7 +2859,6 @@ call1 (fn, arg1)
      Lisp_Object fn, arg1;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[2];
 
   args[0] = fn;
@@ -2803,11 +2866,6 @@ call1 (fn, arg1)
   GCPRO1 (args[0]);
   gcpro1.nvars = 2;
   RETURN_UNGCPRO (Ffuncall (2, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 2;
-  RETURN_UNGCPRO (Ffuncall (2, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn with 2 arguments arg1, arg2 */
@@ -2817,7 +2875,6 @@ call2 (fn, arg1, arg2)
      Lisp_Object fn, arg1, arg2;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[3];
   args[0] = fn;
   args[1] = arg1;
@@ -2825,11 +2882,6 @@ call2 (fn, arg1, arg2)
   GCPRO1 (args[0]);
   gcpro1.nvars = 3;
   RETURN_UNGCPRO (Ffuncall (3, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 3;
-  RETURN_UNGCPRO (Ffuncall (3, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn with 3 arguments arg1, arg2, arg3 */
@@ -2839,7 +2891,6 @@ call3 (fn, arg1, arg2, arg3)
      Lisp_Object fn, arg1, arg2, arg3;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[4];
   args[0] = fn;
   args[1] = arg1;
@@ -2848,11 +2899,6 @@ call3 (fn, arg1, arg2, arg3)
   GCPRO1 (args[0]);
   gcpro1.nvars = 4;
   RETURN_UNGCPRO (Ffuncall (4, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 4;
-  RETURN_UNGCPRO (Ffuncall (4, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn with 4 arguments arg1, arg2, arg3, arg4 */
@@ -2862,7 +2908,6 @@ call4 (fn, arg1, arg2, arg3, arg4)
      Lisp_Object fn, arg1, arg2, arg3, arg4;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[5];
   args[0] = fn;
   args[1] = arg1;
@@ -2872,11 +2917,6 @@ call4 (fn, arg1, arg2, arg3, arg4)
   GCPRO1 (args[0]);
   gcpro1.nvars = 5;
   RETURN_UNGCPRO (Ffuncall (5, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 5;
-  RETURN_UNGCPRO (Ffuncall (5, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5 */
@@ -2886,7 +2926,6 @@ call5 (fn, arg1, arg2, arg3, arg4, arg5)
      Lisp_Object fn, arg1, arg2, arg3, arg4, arg5;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[6];
   args[0] = fn;
   args[1] = arg1;
@@ -2897,11 +2936,6 @@ call5 (fn, arg1, arg2, arg3, arg4, arg5)
   GCPRO1 (args[0]);
   gcpro1.nvars = 6;
   RETURN_UNGCPRO (Ffuncall (6, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 6;
-  RETURN_UNGCPRO (Ffuncall (6, &fn));
-#endif /* not NO_ARG_ARRAY */
 }
 
 /* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6 */
@@ -2911,7 +2945,6 @@ call6 (fn, arg1, arg2, arg3, arg4, arg5, arg6)
      Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6;
 {
   struct gcpro gcpro1;
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[7];
   args[0] = fn;
   args[1] = arg1;
@@ -2923,11 +2956,27 @@ call6 (fn, arg1, arg2, arg3, arg4, arg5, arg6)
   GCPRO1 (args[0]);
   gcpro1.nvars = 7;
   RETURN_UNGCPRO (Ffuncall (7, args));
-#else /* not NO_ARG_ARRAY */
-  GCPRO1 (fn);
-  gcpro1.nvars = 7;
-  RETURN_UNGCPRO (Ffuncall (7, &fn));
-#endif /* not NO_ARG_ARRAY */
+}
+
+/* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7 */
+/* ARGSUSED */
+Lisp_Object
+call7 (fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+     Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
+{
+  struct gcpro gcpro1;
+  Lisp_Object args[8];
+  args[0] = fn;
+  args[1] = arg1;
+  args[2] = arg2;
+  args[3] = arg3;
+  args[4] = arg4;
+  args[5] = arg5;
+  args[6] = arg6;
+  args[7] = arg7;
+  GCPRO1 (args[0]);
+  gcpro1.nvars = 8;
+  RETURN_UNGCPRO (Ffuncall (8, args));
 }
 
 /* The caller should GCPRO all the elements of ARGS.  */
@@ -3263,78 +3312,94 @@ void
 specbind (symbol, value)
      Lisp_Object symbol, value;
 {
-  Lisp_Object valcontents;
+  struct Lisp_Symbol *sym;
+
+  eassert (!handling_signal);
 
   CHECK_SYMBOL (symbol);
+  sym = XSYMBOL (symbol);
   if (specpdl_ptr == specpdl + specpdl_size)
     grow_specpdl ();
 
-  /* The most common case is that of a non-constant symbol with a
-     trivial value.  Make that as fast as we can.  */
-  valcontents = SYMBOL_VALUE (symbol);
-  if (!MISCP (valcontents) && !SYMBOL_CONSTANT_P (symbol))
-    {
-      specpdl_ptr->symbol = symbol;
-      specpdl_ptr->old_value = valcontents;
-      specpdl_ptr->func = NULL;
-      ++specpdl_ptr;
-      SET_SYMBOL_VALUE (symbol, value);
-    }
-  else
-    {
-      Lisp_Object ovalue = find_symbol_value (symbol);
-      specpdl_ptr->func = 0;
-      specpdl_ptr->old_value = ovalue;
-
-      valcontents = XSYMBOL (symbol)->value;
-
-      if (BUFFER_LOCAL_VALUEP (valcontents)
-          || BUFFER_OBJFWDP (valcontents))
-        {
-          Lisp_Object where, current_buffer;
-
-          current_buffer = Fcurrent_buffer ();
-
-          /* For a local variable, record both the symbol and which
-             buffer's or frame's value we are saving.  */
-          if (!NILP (Flocal_variable_p (symbol, Qnil)))
-            where = current_buffer;
-          else if (BUFFER_LOCAL_VALUEP (valcontents)
-                   && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame)
-            where = XBUFFER_LOCAL_VALUE (valcontents)->frame;
+ start:
+  switch (sym->redirect)
+    {
+    case SYMBOL_VARALIAS:
+      sym = indirect_variable (sym); XSETSYMBOL (symbol, sym); goto start;
+    case SYMBOL_PLAINVAL:
+        { /* The most common case is that of a non-constant symbol with a
+             trivial value.  Make that as fast as we can.  */
+          specpdl_ptr->symbol = symbol;
+          specpdl_ptr->old_value = SYMBOL_VAL (sym);
+          specpdl_ptr->func = NULL;
+          ++specpdl_ptr;
+          if (!sym->constant)
+            SET_SYMBOL_VAL (sym, value);
           else
-            where = Qnil;
-
-          /* We're not using the `unused' slot in the specbinding
-             structure because this would mean we have to do more
-             work for simple variables.  */
-          specpdl_ptr->symbol = Fcons (symbol, Fcons (where, current_buffer));
-
-          /* If SYMBOL is a per-buffer variable which doesn't have a
-             buffer-local value here, make the `let' change the global
-             value by changing the value of SYMBOL in all buffers not
-             having their own value.  This is consistent with what
-             happens with other buffer-local variables.  */
-          if (NILP (where)
-              && BUFFER_OBJFWDP (valcontents))
-            {
-              ++specpdl_ptr;
-              Fset_default (symbol, value);
-              return;
-            }
+            set_internal (symbol, value, Qnil, 1);
+          break;
         }
-      else
-        specpdl_ptr->symbol = symbol;
-
-      specpdl_ptr++;
-      /* We used to do
-            if (BUFFER_OBJFWDP (ovalue) || KBOARD_OBJFWDP (ovalue))
-              store_symval_forwarding (symbol, ovalue, value, NULL);
-            else
-         but ovalue comes from find_symbol_value which should never return
-         such an internal value.  */
-      eassert (!(BUFFER_OBJFWDP (ovalue) || KBOARD_OBJFWDP (ovalue)));
-      set_internal (symbol, value, 0, 1);
+    case SYMBOL_LOCALIZED: case SYMBOL_FORWARDED:
+      {
+        Lisp_Object ovalue = find_symbol_value (symbol);
+        specpdl_ptr->func = 0;
+        specpdl_ptr->old_value = ovalue;
+
+        eassert (sym->redirect != SYMBOL_LOCALIZED
+                 || (EQ (SYMBOL_BLV (sym)->where,
+                         SYMBOL_BLV (sym)->frame_local ?
+                         Fselected_frame () : Fcurrent_buffer ())));
+
+        if (sym->redirect == SYMBOL_LOCALIZED
+            || BUFFER_OBJFWDP (SYMBOL_FWD (sym)))
+          {
+            Lisp_Object where, cur_buf = Fcurrent_buffer ();
+
+            /* For a local variable, record both the symbol and which
+               buffer's or frame's value we are saving.  */
+            if (!NILP (Flocal_variable_p (symbol, Qnil)))
+              {
+                eassert (sym->redirect != SYMBOL_LOCALIZED
+                         || (BLV_FOUND (SYMBOL_BLV (sym))
+                             && EQ (cur_buf, SYMBOL_BLV (sym)->where)));
+                where = cur_buf;
+              }
+            else if (sym->redirect == SYMBOL_LOCALIZED
+                     && BLV_FOUND (SYMBOL_BLV (sym)))
+              where = SYMBOL_BLV (sym)->where;
+            else
+              where = Qnil;
+
+            /* We're not using the `unused' slot in the specbinding
+               structure because this would mean we have to do more
+               work for simple variables.  */
+            /* FIXME: The third value `current_buffer' is only used in
+               let_shadows_buffer_binding_p which is itself only used
+               in set_internal for local_if_set.  */
+            specpdl_ptr->symbol = Fcons (symbol, Fcons (where, cur_buf));
+
+            /* If SYMBOL is a per-buffer variable which doesn't have a
+               buffer-local value here, make the `let' change the global
+               value by changing the value of SYMBOL in all buffers not
+               having their own value.  This is consistent with what
+               happens with other buffer-local variables.  */
+            if (NILP (where)
+                && sym->redirect == SYMBOL_FORWARDED)
+              {
+                eassert (BUFFER_OBJFWDP (SYMBOL_FWD (sym)));
+                ++specpdl_ptr;
+                Fset_default (symbol, value);
+                return;
+              }
+          }
+        else
+          specpdl_ptr->symbol = symbol;
+
+        specpdl_ptr++;
+        set_internal (symbol, value, Qnil, 1);
+        break;
+      }
+    default: abort ();
     }
 }
 
@@ -3393,21 +3458,26 @@ unbind_to (count, value)
 
           if (NILP (where))
             Fset_default (symbol, this_binding.old_value);
+          /* If `where' is non-nil, reset the value in the appropriate
+             local binding, but only if that binding still exists.  */
           else if (BUFFERP (where))
-            set_internal (symbol, this_binding.old_value, XBUFFER (where), 1);
-          else
-            set_internal (symbol, this_binding.old_value, NULL, 1);
+            {
+              if (BUFFERP (where)
+                  ? !NILP (Flocal_variable_p (symbol, where))
+                  : !NILP (Fassq (symbol, XFRAME (where)->param_alist)))
+                set_internal (symbol, this_binding.old_value, where, 1);
+            }
         }
+      /* If variable has a trivial value (no forwarding), we can
+         just set it.  No need to check for constant symbols here,
+         since that was already done by specbind.  */
+      else if (XSYMBOL (this_binding.symbol)->redirect == SYMBOL_PLAINVAL)
+        SET_SYMBOL_VAL (XSYMBOL (this_binding.symbol),
+                        this_binding.old_value);
       else
-        {
-          /* If variable has a trivial value (no forwarding), we can
-             just set it.  No need to check for constant symbols here,
-             since that was already done by specbind.  */
-          if (!MISCP (SYMBOL_VALUE (this_binding.symbol)))
-            SET_SYMBOL_VALUE (this_binding.symbol, this_binding.old_value);
-          else
-            set_internal (this_binding.symbol, this_binding.old_value, 0, 1);
-        }
+        /* NOTE: we only ever come here if make_local_foo was used for
+           the first time on this var within this let.  */
+        Fset_default (this_binding.symbol, this_binding.old_value);
     }
 
   if (NILP (Vquit_flag) && !NILP (quitf))
diff --git a/src/fileio.c b/src/fileio.c
index e9440adabe0..85685ebc9c4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -53,6 +53,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <ctype.h>
 #include <errno.h>
 
+#ifdef HAVE_LIBSELINUX
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#endif
+
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -294,7 +299,7 @@ close_file_unwind (fd)
 
 /* Restore point, having saved it as a marker.  */
 
-static Lisp_Object
+Lisp_Object
 restore_point_unwind (location)
      Lisp_Object location;
 {
@@ -331,6 +336,8 @@ Lisp_Object Qfile_accessible_directory_p;
 Lisp_Object Qfile_modes;
 Lisp_Object Qset_file_modes;
 Lisp_Object Qset_file_times;
+Lisp_Object Qfile_selinux_context;
+Lisp_Object Qset_file_selinux_context;
 Lisp_Object Qfile_newer_than_file_p;
 Lisp_Object Qinsert_file_contents;
 Lisp_Object Qwrite_region;
@@ -1894,7 +1901,7 @@ barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick)
   return;
 }
 
-DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 5,
+DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 6,
        "fCopy file: \nGCopy %s to file: \np\nP",
        doc: /* Copy FILE to NEWNAME.  Both args must be strings.
 If NEWNAME names a directory, copy FILE there.
@@ -1916,10 +1923,13 @@ last-modified time as the old one.  (This works on only some systems.)
 A prefix arg makes KEEP-TIME non-nil.
 
 If PRESERVE-UID-GID is non-nil, we try to transfer the
-uid and gid of FILE to NEWNAME.  */)
-  (file, newname, ok_if_already_exists, keep_time, preserve_uid_gid)
+uid and gid of FILE to NEWNAME.
+
+If PRESERVE-SELINUX-CONTEXT is non-nil and SELinux is enabled 
+on the system, we copy the SELinux context of FILE to NEWNAME.  */)
+     (file, newname, ok_if_already_exists, keep_time, preserve_uid_gid, preserve_selinux_context)
      Lisp_Object file, newname, ok_if_already_exists, keep_time;
-     Lisp_Object preserve_uid_gid;
+     Lisp_Object preserve_uid_gid, preserve_selinux_context;
 {
   int ifd, ofd, n;
   char buf[16 * 1024];
@@ -1929,6 +1939,10 @@ uid and gid of FILE to NEWNAME.  */)
   int count = SPECPDL_INDEX ();
   int input_file_statable_p;
   Lisp_Object encoded_file, encoded_newname;
+#if HAVE_LIBSELINUX
+  security_context_t con;
+  int fail, conlength = 0;
+#endif
 
   encoded_file = encoded_newname = Qnil;
   GCPRO4 (file, newname, encoded_file, encoded_newname);
@@ -1949,8 +1963,9 @@ uid and gid of FILE to NEWNAME.  */)
   if (NILP (handler))
     handler = Ffind_file_name_handler (newname, Qcopy_file);
   if (!NILP (handler))
-    RETURN_UNGCPRO (call6 (handler, Qcopy_file, file, newname,
-                           ok_if_already_exists, keep_time, preserve_uid_gid));
+    RETURN_UNGCPRO (call7 (handler, Qcopy_file, file, newname,
+                           ok_if_already_exists, keep_time, preserve_uid_gid,
+                           preserve_selinux_context));
 
   encoded_file = ENCODE_FILE (file);
   encoded_newname = ENCODE_FILE (newname);
@@ -2004,6 +2019,15 @@ uid and gid of FILE to NEWNAME.  */)
      copyable by us. */
   input_file_statable_p = (fstat (ifd, &st) >= 0);
 
+#if HAVE_LIBSELINUX
+  if (!NILP (preserve_selinux_context) && is_selinux_enabled ())
+    {
+      conlength = fgetfilecon (ifd, &con);
+      if (conlength == -1)
+        report_file_error ("Doing fgetfilecon", Fcons (file, Qnil));
+    }
+#endif
+
   if (out_st.st_mode != 0
       && st.st_dev == out_st.st_dev && st.st_ino == out_st.st_ino)
     {
@@ -2061,6 +2085,18 @@ uid and gid of FILE to NEWNAME.  */)
     }
 #endif  /* not MSDOS */
 
+#if HAVE_LIBSELINUX
+  if (conlength > 0)
+    {
+      /* Set the modified context back to the file. */
+      fail = fsetfilecon (ofd, con);
+      if (fail)
+        report_file_error ("Doing fsetfilecon", Fcons (newname, Qnil));
+
+      freecon (con);
+    }
+#endif
+
   /* Closing the output clobbers the file times on some systems.  */
   if (emacs_close (ofd) < 0)
     report_file_error ("I/O error", Fcons (newname, Qnil));
@@ -2158,11 +2194,17 @@ DEFUN ("delete-directory-internal", Fdelete_directory_internal,
   return Qnil;
 }
 
-DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 1, "fDelete file: ",
+DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 2, "fDelete file: \nP",
        doc: /* Delete file named FILENAME.  If it is a symlink, remove the symlink.
-If file has multiple names, it continues to exist with the other names.  */)
-     (filename)
+If file has multiple names, it continues to exist with the other names.
+
+If optional arg FORCE is non-nil, really delete the file regardless of
+`delete-by-moving-to-trash'.  Otherwise, \"deleting\" actually moves
+it to the system's trash can if `delete-by-moving-to-trash' is non-nil.
+Interactively, FORCE is non-nil if called with a prefix arg.  */)
+     (filename, force)
      Lisp_Object filename;
+     Lisp_Object force;
 {
   Lisp_Object handler;
   Lisp_Object encoded_file;
@@ -2181,7 +2223,7 @@ If file has multiple names, it continues to exist with the other names.  */)
   if (!NILP (handler))
     return call2 (handler, Qdelete_file, filename);
 
-  if (delete_by_moving_to_trash)
+  if (delete_by_moving_to_trash && NILP (force))
     return call1 (Qmove_file_to_trash, filename);
 
   encoded_file = ENCODE_FILE (filename);
@@ -2198,14 +2240,15 @@ internal_delete_file_1 (ignore)
   return Qt;
 }
 
-/* Delete file FILENAME, returning 1 if successful and 0 if failed.  */
+/* Delete file FILENAME, returning 1 if successful and 0 if failed.
+   FORCE means to ignore `delete-by-moving-to-trash'.  */
 
 int
-internal_delete_file (filename)
-     Lisp_Object filename;
+internal_delete_file (Lisp_Object filename, Lisp_Object force)
 {
   Lisp_Object tem;
-  tem = internal_condition_case_1 (Fdelete_file, filename,
+
+  tem = internal_condition_case_2 (Fdelete_file, filename, force,
                                    Qt, internal_delete_file_1);
   return NILP (tem);
 }
@@ -2287,7 +2330,7 @@ This is what happens in interactive use with M-x.  */)
                have copy-file prompt again.  */
             Fcopy_file (file, newname,
                         NILP (ok_if_already_exists) ? Qnil : Qt,
-                        Qt, Qt);
+                        Qt, Qt, Qt);
 
           count = SPECPDL_INDEX ();
           specbind (Qdelete_by_moving_to_trash, Qnil);
@@ -2299,7 +2342,7 @@ This is what happens in interactive use with M-x.  */)
               )
             call2 (Qdelete_directory, file, Qt);
           else
-            Fdelete_file (file);
+            Fdelete_file (file, Qt);
           unbind_to (count, Qnil);
         }
       else
@@ -2844,6 +2887,140 @@ See `file-symlink-p' to distinguish symlinks.  */)
 #endif
 }
 
+DEFUN ("file-selinux-context", Ffile_selinux_context,
+       Sfile_selinux_context, 1, 1, 0,
+       doc: /* Return SELinux context of file named FILENAME,
+as a list ("user", "role", "type", "range"). Return (nil, nil, nil, nil)
+if file does not exist, is not accessible, or SELinux is disabled */)
+     (filename)
+     Lisp_Object filename;
+{
+  Lisp_Object absname;
+  Lisp_Object values[4];
+  Lisp_Object handler;
+#if HAVE_LIBSELINUX
+  security_context_t con;
+  int conlength;
+  context_t context;
+#endif
+
+  absname = expand_and_dir_to_file (filename, current_buffer->directory);
+
+  /* If the file name has special constructs in it,
+     call the corresponding file handler.  */
+  handler = Ffind_file_name_handler (absname, Qfile_selinux_context);
+  if (!NILP (handler))
+    return call2 (handler, Qfile_selinux_context, absname);
+
+  absname = ENCODE_FILE (absname);
+
+  values[0] = Qnil;
+  values[1] = Qnil;
+  values[2] = Qnil;
+  values[3] = Qnil;
+#if HAVE_LIBSELINUX
+  if (is_selinux_enabled ())
+    {
+      conlength = lgetfilecon (SDATA (absname), &con);
+      if (conlength > 0)
+        {
+          context = context_new (con);
+          if (context_user_get (context))
+            values[0] = build_string (context_user_get (context));
+          if (context_role_get (context))
+            values[1] = build_string (context_role_get (context));
+          if (context_type_get (context))
+            values[2] = build_string (context_type_get (context));
+          if (context_range_get (context))
+            values[3] = build_string (context_range_get (context));
+          context_free (context);
+        }
+      if (con)
+        freecon (con);
+    }
+#endif
+
+  return Flist (sizeof(values) / sizeof(values[0]), values);
+}
+
+DEFUN ("set-file-selinux-context", Fset_file_selinux_context,
+       Sset_file_selinux_context, 2, 2, 0,
+       doc: /* Set SELinux context of file named FILENAME to CONTEXT
+as a list ("user", "role", "type", "range"). Has no effect if SELinux
+is disabled. */)
+     (filename, context)
+     Lisp_Object filename, context;
+{
+  Lisp_Object absname, encoded_absname;
+  Lisp_Object handler;
+  Lisp_Object user = CAR_SAFE (context);
+  Lisp_Object role = CAR_SAFE (CDR_SAFE (context));
+  Lisp_Object type = CAR_SAFE (CDR_SAFE (CDR_SAFE (context)));
+  Lisp_Object range = CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (context))));
+#if HAVE_LIBSELINUX
+  security_context_t con;
+  int fail, conlength;
+  context_t parsed_con;
+#endif
+
+  absname = Fexpand_file_name (filename, current_buffer->directory);
+
+  /* If the file name has special constructs in it,
+     call the corresponding file handler.  */
+  handler = Ffind_file_name_handler (absname, Qset_file_selinux_context);
+  if (!NILP (handler))
+    return call3 (handler, Qset_file_selinux_context, absname, context);
+
+  encoded_absname = ENCODE_FILE (absname);
+
+#if HAVE_LIBSELINUX
+  if (is_selinux_enabled ())
+    {
+      /* Get current file context. */
+      conlength = lgetfilecon (SDATA (encoded_absname), &con);
+      if (conlength > 0)
+        {
+          parsed_con = context_new (con);
+          /* Change the parts defined in the parameter.*/
+          if (STRINGP (user))
+            {
+              if (context_user_set (parsed_con, SDATA (user)))
+                error ("Doing context_user_set");
+            }
+          if (STRINGP (role))
+            {
+              if (context_role_set (parsed_con, SDATA (role)))
+                error ("Doing context_role_set");
+            }
+          if (STRINGP (type))
+            {
+              if (context_type_set (parsed_con, SDATA (type)))
+                error ("Doing context_type_set");
+            }
+          if (STRINGP (range))
+            {
+              if (context_range_set (parsed_con, SDATA (range)))
+                error ("Doing context_range_set");
+            }
+
+          /* Set the modified context back to the file. */
+          fail = lsetfilecon (SDATA (encoded_absname), context_str (parsed_con));
+          if (fail)
+            report_file_error ("Doing lsetfilecon", Fcons (absname, Qnil));
+
+          context_free (parsed_con);
+        }
+      else
+        report_file_error("Doing lgetfilecon", Fcons (absname, Qnil));
+
+      if (con)
+        freecon (con);
+    }
+#endif
+
+  return Qnil;
+}
+
 DEFUN ("file-modes", Ffile_modes, Sfile_modes, 1, 1, 0,
        doc: /* Return mode bits of file named FILENAME, as an integer.
 Return nil, if file does not exist or is not accessible.  */)
@@ -5505,6 +5682,8 @@ syms_of_fileio ()
   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");
@@ -5540,6 +5719,8 @@ syms_of_fileio ()
   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);
@@ -5773,6 +5954,8 @@ When non-nil, the function `move-file-to-trash' will be used by
   defsubr (&Sfile_modes);
   defsubr (&Sset_file_modes);
   defsubr (&Sset_file_times);
+  defsubr (&Sfile_selinux_context);
+  defsubr (&Sset_file_selinux_context);
   defsubr (&Sset_default_file_modes);
   defsubr (&Sdefault_file_modes);
   defsubr (&Sfile_newer_than_file_p);
diff --git a/src/floatfns.c b/src/floatfns.c
index 3f7030b7605..5cd996d033c 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -288,6 +288,70 @@ DEFUN ("tan", Ftan, Stan, 1, 1, 0,
   IN_FLOAT (d = sin (d) / c, "tan", arg);
   return make_float (d);
 }
+
+#if defined HAVE_ISNAN && defined HAVE_COPYSIGN
+DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0,
+       doc: /* Return non nil iff argument X is a NaN.  */)
+     (x)
+     Lisp_Object x;
+{
+  CHECK_FLOAT (x);
+  return isnan (XFLOAT_DATA (x)) ? Qt : Qnil;
+}
+
+DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0,
+       doc: /* Copy sign of X2 to value of X1, and return the result.
+Cause an error if X1 or X2 is not a float.  */)
+     (x1, x2)
+     Lisp_Object x1, x2;
+{
+  double f1, f2;
+
+  CHECK_FLOAT (x1);
+  CHECK_FLOAT (x2);
+
+  f1 = XFLOAT_DATA (x1);
+  f2 = XFLOAT_DATA (x2);
+
+  return make_float (copysign (f1, f2));
+}
+
+DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0,
+       doc: /* Get significand and exponent of a floating point number.
+Breaks the floating point number X into its binary significand SGNFCAND
+\(a floating point value between 0.5 (included) and 1.0 (excluded))
+and an integral exponent EXP for 2, such that:
+
+  X = SGNFCAND * 2^EXP
+
+The function returns the cons cell (SGNFCAND . EXP).
+If X is zero, both parts (SGNFCAND and EXP) are zero.  */)
+     (x)
+     Lisp_Object x;
+{
+  double f = XFLOATINT (x);
+
+  if (f == 0.0)
+    return Fcons (make_float (0.0), make_number (0));
+  else
+    {
+      int    exp;
+      double sgnfcand = frexp (f, &exp);
+      return Fcons (make_float (sgnfcand), make_number (exp));
+    }
+}
+
+DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0,
+       doc: /* Construct number X from significand SGNFCAND and exponent EXP.
+Returns the floating point value resulting from multiplying SGNFCAND
+(the significand) by 2 raised to the power of EXP (the exponent).   */)
+     (sgnfcand, exp)
+     Lisp_Object sgnfcand, exp;
+{
+  CHECK_NUMBER (exp);
+  return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exp)));
+}
+#endif
 
 #if 0 /* Leave these out unless we find there's a reason for them.  */
 
@@ -1017,6 +1081,12 @@ syms_of_floatfns ()
   defsubr (&Scos);
   defsubr (&Ssin);
   defsubr (&Stan);
+#if defined HAVE_ISNAN && defined HAVE_COPYSIGN
+  defsubr (&Sisnan);
+  defsubr (&Scopysign);
+  defsubr (&Sfrexp);
+  defsubr (&Sldexp);
+#endif 
 #if 0
   defsubr (&Sacosh);
   defsubr (&Sasinh);
diff --git a/src/fns.c b/src/fns.c
index 0100ff228f2..b4d132ea0c1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -392,14 +392,10 @@ Lisp_Object
 concat2 (s1, s2)
      Lisp_Object s1, s2;
 {
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[2];
   args[0] = s1;
   args[1] = s2;
   return concat (2, args, Lisp_String, 0);
-#else
-  return concat (2, &s1, Lisp_String, 0);
-#endif /* NO_ARG_ARRAY */
 }
 
 /* ARGSUSED */
@@ -407,15 +403,11 @@ Lisp_Object
 concat3 (s1, s2, s3)
      Lisp_Object s1, s2, s3;
 {
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[3];
   args[0] = s1;
   args[1] = s2;
   args[2] = s3;
   return concat (3, args, Lisp_String, 0);
-#else
-  return concat (3, &s1, Lisp_String, 0);
-#endif /* NO_ARG_ARRAY */
 }
 
 DEFUN ("append", Fappend, Sappend, 0, MANY, 0,
@@ -2344,14 +2336,10 @@ Lisp_Object
 nconc2 (s1, s2)
      Lisp_Object s1, s2;
 {
-#ifdef NO_ARG_ARRAY
   Lisp_Object args[2];
   args[0] = s1;
   args[1] = s2;
   return Fnconc (2, args);
-#else
-  return Fnconc (2, &s1);
-#endif /* NO_ARG_ARRAY */
 }
 
 DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0,
diff --git a/src/font.c b/src/font.c
index 765712198fe..2d55065e9c8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -5376,22 +5376,30 @@ non-nil value in the table are supported.  If REPERTORY is nil, Emacs
 gets the repertory information by an opened font and ENCODING.  */);
   Vfont_encoding_alist = Qnil;
 
+  /* FIXME: These 3 vars are not quite what they appear: setq on them
+     won't have any effect other than disconnect them from the style
+     table used by the font display code.  So we make them read-only,
+     to avoid this confusing situation.  */
+
   DEFVAR_LISP_NOPRO ("font-weight-table", &Vfont_weight_table,
                doc: /*  Vector of valid font weight values.
 Each element has the form:
     [NUMERIC-VALUE SYMBOLIC-NAME ALIAS-NAME ...]
 NUMERIC-VALUE is an integer, and SYMBOLIC-NAME and ALIAS-NAME are symbols. */);
   Vfont_weight_table = BUILD_STYLE_TABLE (weight_table);
+  XSYMBOL (intern_c_string ("font-weight-table"))->constant = 1;
 
   DEFVAR_LISP_NOPRO ("font-slant-table", &Vfont_slant_table,
                doc: /*  Vector of font slant symbols vs the corresponding numeric values.
 See `font-weight-table' for the format of the vector. */);
   Vfont_slant_table = BUILD_STYLE_TABLE (slant_table);
+  XSYMBOL (intern_c_string ("font-slant-table"))->constant = 1;
 
   DEFVAR_LISP_NOPRO ("font-width-table", &Vfont_width_table,
                doc: /*  Alist of font width symbols vs the corresponding numeric values.
 See `font-weight-table' for the format of the vector. */);
   Vfont_width_table = BUILD_STYLE_TABLE (width_table);
+  XSYMBOL (intern_c_string ("font-width-table"))->constant = 1;
 
   staticpro (&font_style_table);
   font_style_table = Fmake_vector (make_number (3), Qnil);
diff --git a/src/frame.c b/src/frame.c
index 757ed8f01a3..3e1b2daf556 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2298,13 +2298,20 @@ store_frame_param (f, prop, val)
      without messing up the symbol's status.  */
   if (SYMBOLP (prop))
     {
-      Lisp_Object valcontents;
-      valcontents = SYMBOL_VALUE (prop);
-      if ((BUFFER_LOCAL_VALUEP (valcontents))
-          && XBUFFER_LOCAL_VALUE (valcontents)->check_frame
-          && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame
-          && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f)
-        swap_in_global_binding (prop);
+      struct Lisp_Symbol *sym = XSYMBOL (prop);
+    start:
+      switch (sym->redirect)
+        {
+        case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
+        case SYMBOL_PLAINVAL: case SYMBOL_FORWARDED: break;
+        case SYMBOL_LOCALIZED:
+          { struct Lisp_Buffer_Local_Value *blv = sym->val.blv;
+            if (blv->frame_local && BLV_FOUND (blv) && XFRAME (blv->where) == f)
+              swap_in_global_binding (sym);
+            break;
+          }
+        default: abort ();
+        }
     }
 
   /* The tty color needed to be set before the frame's parameter
@@ -2520,6 +2527,8 @@ If FRAME is nil, describe the currently selected frame.  */)
                || EQ (parameter, Qbackground_mode))
         value = Fcdr (Fassq (parameter, f->param_alist));
       else
+        /* FIXME: Avoid this code path at all (as well as code duplication)
+           by sharing more code with Fframe_parameters.  */
         value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
     }
 
diff --git a/src/frame.h b/src/frame.h
index 36b0b6b069c..887d47eff21 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -980,7 +980,7 @@ extern Lisp_Object selected_frame;
    at ROW/COL.  */
 
 #define FRAME_LINE_TO_PIXEL_Y(f, row) \
-  ((row < FRAME_TOP_MARGIN (f) ? 0 : FRAME_INTERNAL_BORDER_WIDTH (f))   \
+  (((row) < FRAME_TOP_MARGIN (f) ? 0 : FRAME_INTERNAL_BORDER_WIDTH (f)) \
    + (row) * FRAME_LINE_HEIGHT (f))
 
 #define FRAME_COL_TO_PIXEL_X(f, col) \
diff --git a/src/fringe.c b/src/fringe.c
index 952e95a5517..6dcacbbcd3f 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -825,7 +825,7 @@ draw_fringe_bitmap (w, row, left_p)
 {
   int overlay = 0;
 
-  if (!left_p && row->cursor_in_fringe_p)
+  if (left_p == row->reversed_p && row->cursor_in_fringe_p)
     {
       Lisp_Object cursor = Qnil;
 
@@ -857,7 +857,7 @@ draw_fringe_bitmap (w, row, left_p)
           int bm = get_logical_cursor_bitmap (w, cursor);
           if (bm != NO_FRINGE_BITMAP)
             {
-              draw_fringe_bitmap_1 (w, row, 0, 2, bm);
+              draw_fringe_bitmap_1 (w, row, left_p, 2, bm);
               overlay = EQ (cursor, Qbox) ? 3 : 1;
             }
         }
@@ -1082,7 +1082,8 @@ update_window_fringes (w, keep_current_p)
           left = row->left_user_fringe_bitmap;
           left_face_id = row->left_user_fringe_face_id;
         }
-      else if (row->truncated_on_left_p)
+      else if ((!row->reversed_p && row->truncated_on_left_p)
+               || (row->reversed_p && row->truncated_on_right_p))
         left = LEFT_FRINGE(0, Qtruncation, 0);
       else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
         left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
@@ -1090,7 +1091,8 @@ update_window_fringes (w, keep_current_p)
                 : LEFT_FRINGE (2, Qtop, 0));
       else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
         left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p);
-      else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
+      else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))
+               || (row->reversed_p && row->continued_p))
         left = LEFT_FRINGE (4, Qcontinuation, 0);
       else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
         left = LEFT_FRINGE (5, Qempty_line, 0);
@@ -1109,7 +1111,8 @@ update_window_fringes (w, keep_current_p)
           right = row->right_user_fringe_bitmap;
           right_face_id = row->right_user_fringe_face_id;
         }
-      else if (row->truncated_on_right_p)
+      else if ((!row->reversed_p && row->truncated_on_right_p)
+               || (row->reversed_p && row->truncated_on_left_p))
         right = RIGHT_FRINGE (0, Qtruncation, 0);
       else if (row->indicate_bob_p && EQ (boundary_top, Qright))
         right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
@@ -1117,7 +1120,8 @@ update_window_fringes (w, keep_current_p)
                  : RIGHT_FRINGE (2, Qtop, 0));
       else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
         right = RIGHT_FRINGE (3, Qbottom, row->ends_at_zv_p);
-      else if (row->continued_p)
+      else if ((!row->reversed_p && row->continued_p)
+               || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)))
         right = RIGHT_FRINGE (4, Qcontinuation, 0);
       else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
         right = RIGHT_FRINGE (6, Qup, 0);
diff --git a/src/ftfont.c b/src/ftfont.c
index f4fe5b8e5c0..9699dc58009 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1578,6 +1578,14 @@ ftfont_otf_capability (font)
 
 #ifdef HAVE_M17N_FLT
 
+#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10))      \
+     && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)))
+/* We can use the new feature of libotf and m17n-flt to handle the
+   character encoding scheme introduced in Unicode 5.1 and 5.2 for
+   some Agian scripts.  */
+#define M17N_FLT_USE_NEW_FEATURE
+#endif
+
 struct MFLTFontFT
 {
   MFLTFont flt_font;
@@ -1696,10 +1704,16 @@ ftfont_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
           else
             tags[n] = spec->features[i][n];
         }
+#ifdef M17N_FLT_USE_NEW_FEATURE
+      if (OTF_check_features (otf, i == 0, spec->script, spec->langsys,
+                              tags, n - negative) != 1)
+        return 0;
+#else  /* not M17N_FLT_USE_NEW_FEATURE */
       if (n - negative > 0
           && OTF_check_features (otf, i == 0, spec->script, spec->langsys,
                                  tags, n - negative) != 1)
         return 0;
+#endif  /* not M17N_FLT_USE_NEW_FEATURE */
     }
   return 1;
 }
@@ -1757,6 +1771,356 @@ setup_otf_gstring (int size)
   memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * size);
 }
 
+#ifdef M17N_FLT_USE_NEW_FEATURE
+
+/* Pack 32-bit OTF tag (0x7F7F7F7F) into 28-bit (0x0FFFFFFF).  */
+#define PACK_OTF_TAG(TAG)       \
+  ((((TAG) & 0x7F000000) >> 3)  \
+    | (((TAG) & 0x7F0000) >> 2) \
+    | (((TAG) & 0x7F00) >> 1)   \
+    | ((TAG) & 0x7F))
+
+/* Assuming that FONT is an OpenType font, apply OpenType features
+   specified in SPEC on glyphs between FROM and TO of IN, and record
+   the lastly applied feature in each glyph of IN.  If OUT is not
+   NULL, append the resulting glyphs to OUT while storing glyph
+   position adjustment information in ADJUSTMENT.  */
+
+static int
+ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
+     MFLTFont *font;
+     MFLTOtfSpec *spec;
+     MFLTGlyphString *in;
+     int from, to;
+     MFLTGlyphString *out;
+     MFLTGlyphAdjustment *adjustment;
+{
+  struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
+  FT_Face ft_face = flt_font_ft->ft_face;
+  OTF *otf = flt_font_ft->otf;
+  int len = to - from;
+  int i, j, gidx;
+  OTF_Glyph *otfg;
+  char script[5], *langsys = NULL;
+  char *gsub_features = NULL, *gpos_features = NULL;
+  OTF_Feature *features;
+
+  if (len == 0)
+    return from;
+  OTF_tag_name (spec->script, script);
+  if (spec->langsys)
+    {
+      langsys = alloca (5);
+      OTF_tag_name (spec->langsys, langsys);
+    }
+  for (i = 0; i < 2; i++)
+    {
+      char *p;
+
+      if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF)
+        {
+          for (j = 0; spec->features[i][j]; j++);
+          if (i == 0)
+            p = gsub_features = alloca (6 * j);
+          else
+            p = gpos_features = alloca (6 * j);
+          for (j = 0; spec->features[i][j]; j++)
+            {
+              if (spec->features[i][j] == 0xFFFFFFFF)
+                *p++ = '*', *p++ = ',';
+              else
+                {
+                  OTF_tag_name (spec->features[i][j], p);
+                  p[4] = ',';
+                  p += 5;
+                }
+            }
+          *--p = '\0';
+        }
+    }
+
+  setup_otf_gstring (len);
+  for (i = 0; i < len; i++)
+    {
+      otf_gstring.glyphs[i].c = in->glyphs[from + i].c;
+      otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code;
+    }
+
+  OTF_drive_gdef (otf, &otf_gstring);
+  gidx = out ? out->used : from;
+
+  if (gsub_features && out)
+    {
+      if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys,
+                                   gsub_features) < 0)
+        goto simple_copy;
+      if (out->allocated < out->used + otf_gstring.used)
+        return -2;
+      features = otf->gsub->FeatureList.Feature;
+      for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; )
+        {
+          MFLTGlyph *g;
+          int min_from, max_to;
+          int j;
+          int feature_idx = otfg->positioning_type >> 4;
+
+          g = out->glyphs + out->used;
+          *g = in->glyphs[from + otfg->f.index.from];
+          if (g->code != otfg->glyph_id)
+            {
+              g->c = 0;
+              g->code = otfg->glyph_id;
+              g->measured = 0;
+            }
+          out->used++;
+          min_from = g->from;
+          max_to = g->to;
+          if (otfg->f.index.from < otfg->f.index.to)
+            {
+              /* OTFG substitutes multiple glyphs in IN.  */
+              for (j = from + otfg->f.index.from + 1;
+                   j <= from + otfg->f.index.to; j++)
+                {
+                  if (min_from > in->glyphs[j].from)
+                    min_from = in->glyphs[j].from;
+                  if (max_to < in->glyphs[j].to)
+                    max_to = in->glyphs[j].to;
+                }
+              g->from = min_from;
+              g->to = max_to;
+            }
+          if (feature_idx)
+            {
+              unsigned int tag = features[feature_idx - 1].FeatureTag;
+              tag = PACK_OTF_TAG (tag);
+              g->internal = (g->internal & ~0x1FFFFFFF) | tag;
+            }
+          for (i++, otfg++; (i < otf_gstring.used
+                             && otfg->f.index.from == otfg[-1].f.index.from);
+               i++, otfg++)
+            {
+              g = out->glyphs + out->used;
+              *g = in->glyphs[from + otfg->f.index.to];
+              if (g->code != otfg->glyph_id)
+                {
+                  g->c = 0;
+                  g->code = otfg->glyph_id;
+                  g->measured = 0;
+                }
+              feature_idx = otfg->positioning_type >> 4;
+              if (feature_idx)
+                {
+                  unsigned int tag = features[feature_idx - 1].FeatureTag;
+                  tag = PACK_OTF_TAG (tag);
+                  g->internal = (g->internal & ~0x1FFFFFFF) | tag;
+                }
+              out->used++;
+            }
+        }
+    }
+  else if (gsub_features)
+    {
+      /* Just for checking which features will be applied.  */
+      if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys,
+                                   gsub_features) < 0)
+        goto simple_copy;
+      features = otf->gsub->FeatureList.Feature;
+      for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; i++,
+             otfg++)
+        {
+          int feature_idx = otfg->positioning_type >> 4;
+
+          if (feature_idx)
+            {
+              unsigned int tag = features[feature_idx - 1].FeatureTag;
+              tag = PACK_OTF_TAG (tag);
+              for (j = otfg->f.index.from; j <= otfg->f.index.to; j++)
+                {
+                  MFLTGlyph *g = in->glyphs + (from + j);
+                  g->internal = (g->internal & ~0x1FFFFFFF) | tag;
+                }
+            }
+        }
+    }
+  else if (out)
+    {
+      if (out->allocated < out->used + len)
+        return -2;
+      for (i = 0; i < len; i++)
+        out->glyphs[out->used++] = in->glyphs[from + i];
+    }
+
+  if (gpos_features && out)
+    {
+      MFLTGlyph *base = NULL, *mark = NULL, *g;
+      int x_ppem, y_ppem, x_scale, y_scale;
+
+      if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys,
+                                   gpos_features) < 0)
+        return to;
+      features = otf->gpos->FeatureList.Feature;
+      x_ppem = ft_face->size->metrics.x_ppem;
+      y_ppem = ft_face->size->metrics.y_ppem;
+      x_scale = ft_face->size->metrics.x_scale;
+      y_scale = ft_face->size->metrics.y_scale;
+
+      for (i = 0, otfg = otf_gstring.glyphs, g = out->glyphs + gidx;
+           i < otf_gstring.used; i++, otfg++, g++)
+        {
+          MFLTGlyph *prev;
+          int feature_idx = otfg->positioning_type >> 4;
+
+          if (feature_idx)
+            {
+              unsigned int tag = features[feature_idx - 1].FeatureTag;
+              tag = PACK_OTF_TAG (tag);
+              g->internal = (g->internal & ~0x1FFFFFFF) | tag;
+            }
+
+          if (! otfg->glyph_id)
+            continue;
+          switch (otfg->positioning_type & 0xF)
+            {
+            case 0:
+              break;
+            case 1:             /* Single */
+            case 2:             /* Pair */
+              {
+                int format = otfg->f.f1.format;
+
+                if (format & OTF_XPlacement)
+                  adjustment[i].xoff
+                    = otfg->f.f1.value->XPlacement * x_scale / 0x10000;
+                if (format & OTF_XPlaDevice)
+                  adjustment[i].xoff
+                    += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, x_ppem);
+                if (format & OTF_YPlacement)
+                  adjustment[i].yoff
+                    = - (otfg->f.f1.value->YPlacement * y_scale / 0x10000);
+                if (format & OTF_YPlaDevice)
+                  adjustment[i].yoff
+                    -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, y_ppem);
+                if (format & OTF_XAdvance)
+                  adjustment[i].xadv
+                    += otfg->f.f1.value->XAdvance * x_scale / 0x10000;
+                if (format & OTF_XAdvDevice)
+                  adjustment[i].xadv
+                    += DEVICE_DELTA (otfg->f.f1.value->XAdvDevice, x_ppem);
+                if (format & OTF_YAdvance)
+                  adjustment[i].yadv
+                    += otfg->f.f1.value->YAdvance * y_scale / 0x10000;
+                if (format & OTF_YAdvDevice)
+                  adjustment[i].yadv
+                    += DEVICE_DELTA (otfg->f.f1.value->YAdvDevice, y_ppem);
+                adjustment[i].set = 1;
+              }
+              break;
+            case 3:             /* Cursive */
+              /* Not yet supported.  */
+              break;
+            case 4:             /* Mark-to-Base */
+            case 5:             /* Mark-to-Ligature */
+              if (! base)
+                break;
+              prev = base;
+              goto label_adjust_anchor;
+            default:            /* i.e. case 6 Mark-to-Mark */
+              if (! mark)
+                break;
+              prev = mark;
+
+            label_adjust_anchor:
+              {
+                int base_x, base_y, mark_x, mark_y;
+                int this_from, this_to;
+
+                base_x = otfg->f.f4.base_anchor->XCoordinate * x_scale / 0x10000;
+                base_y = otfg->f.f4.base_anchor->YCoordinate * y_scale / 0x10000;
+                mark_x = otfg->f.f4.mark_anchor->XCoordinate * x_scale / 0x10000;
+                mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000;
+
+                if (otfg->f.f4.base_anchor->AnchorFormat != 1)
+                  adjust_anchor (ft_face, otfg->f.f4.base_anchor,
+                                 prev->code, x_ppem, y_ppem, &base_x, &base_y);
+                if (otfg->f.f4.mark_anchor->AnchorFormat != 1)
+                  adjust_anchor (ft_face, otfg->f.f4.mark_anchor, g->code,
+                                 x_ppem, y_ppem, &mark_x, &mark_y);
+                adjustment[i].xoff = (base_x - mark_x);
+                adjustment[i].yoff = - (base_y - mark_y);
+                adjustment[i].back = (g - prev);
+                adjustment[i].xadv = 0;
+                adjustment[i].advance_is_absolute = 1;
+                adjustment[i].set = 1;
+                this_from = g->from;
+                this_to = g->to;
+                for (j = 0; prev + j < g; j++)
+                  {
+                    if (this_from > prev[j].from)
+                      this_from = prev[j].from;
+                    if (this_to < prev[j].to)
+                      this_to = prev[j].to;
+                  }
+                for (; prev <= g; prev++)
+                  {
+                    prev->from = this_from;
+                    prev->to = this_to;
+                  }
+              }
+            }
+          if (otfg->GlyphClass == OTF_GlyphClass0)
+            base = mark = g;
+          else if (otfg->GlyphClass == OTF_GlyphClassMark)
+            mark = g;
+          else
+            base = g;
+        }
+    }
+  else if (gpos_features)
+    {
+      if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys,
+                                   gpos_features) < 0)
+        return to;
+      features = otf->gpos->FeatureList.Feature;
+      for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used;
+           i++, otfg++)
+        if (otfg->positioning_type & 0xF)
+          {
+            int feature_idx = otfg->positioning_type >> 4;
+
+            if (feature_idx)
+              {
+                unsigned int tag = features[feature_idx - 1].FeatureTag;
+                tag = PACK_OTF_TAG (tag);
+                for (j = otfg->f.index.from; j <= otfg->f.index.to; j++)
+                  {
+                    MFLTGlyph *g = in->glyphs + (from + j);
+                    g->internal = (g->internal & ~0x1FFFFFFF) | tag;
+                  }
+              }
+          }
+    }
+  return to;
+
+ simple_copy:
+  if (! out)
+    return to;
+  if (out->allocated < out->used + len)
+    return -2;
+  font->get_metrics (font, in, from, to);
+  memcpy (out->glyphs + out->used, in->glyphs + from,
+          sizeof (MFLTGlyph) * len);
+  out->used += len;
+  return to;
+}
+
+static int 
+ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
+                MFLTGlyphString *in, int from, int to)
+{
+  return ftfont_drive_otf (font, spec, in, from, to, NULL, NULL);
+}
+
+#else  /* not M17N_FLT_USE_NEW_FEATURE */
 
 static int
 ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
@@ -2011,6 +2375,8 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
   return to;
 }
 
+#endif  /* not M17N_FLT_USE_NEW_FEATURE */
+
 static MFLTGlyphString gstring;
 
 static int m17n_flt_initialized;
@@ -2034,6 +2400,10 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf, matrix)
   if (! m17n_flt_initialized)
     {
       M17N_INIT ();
+#ifdef M17N_FLT_USE_NEW_FEATURE
+      mflt_enable_new_feature = 1;
+      mflt_try_otf = ftfont_try_otf;
+#endif  /* M17N_FLT_USE_NEW_FEATURE */
       m17n_flt_initialized = 1;
     }
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 25da0baec79..c8800817b68 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -35,6 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "charset.h"
 #include "coding.h"
 #include <gdk/gdkkeysyms.h>
+#include "xsettings.h"
 
 #ifdef HAVE_XFT
 #include <X11/Xft/Xft.h>
@@ -542,7 +543,9 @@ xg_set_geometry (f)
       if (yneg)
         top = -top;
 
-      sprintf (geom_str, "%c%d%c%d",
+      sprintf (geom_str, "=%dx%d%c%d%c%d",
+               FRAME_PIXEL_WIDTH (f),
+               FRAME_PIXEL_HEIGHT (f),
                (xneg ? '-' : '+'), left,
                (yneg ? '-' : '+'), top);
 
@@ -951,6 +954,12 @@ x_wm_set_size_hint (f, flags, user_position)
   else if (win_gravity == StaticGravity)
     size_hints.win_gravity = GDK_GRAVITY_STATIC;
 
+  if (user_position)
+    {
+      hint_flags &= ~GDK_HINT_POS;
+      hint_flags |= GDK_HINT_USER_POS;
+    }
+
   if (hint_flags != f->output_data.x->hint_flags
       || memcmp (&size_hints,
                  &f->output_data.x->size_hints,
@@ -3363,8 +3372,8 @@ xg_event_is_for_scrollbar (f, event)
                || event->type == MotionNotify))
     {
       /* If we are releasing or moving the scroll bar, it has the grab.  */
-      retval = gtk_grab_get_current () != 0
-        && gtk_grab_get_current () != f->output_data.x->edit_widget;
+      GtkWidget *w = gtk_grab_get_current ();
+      retval = w != 0 && GTK_IS_SCROLLBAR (w);
     }
   
   return retval;
@@ -3514,7 +3523,16 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
 {
   GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem));
   GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox)));
-  GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label ("");
+  GtkBox *vb = GTK_BOX (gtk_bin_get_child (GTK_BIN (wbutton)));
+  GtkBoxChild *c1 = (GtkBoxChild *) vb->children->data;
+  GtkBoxChild *c2 = (GtkBoxChild *) vb->children->next->data;
+  GtkImage *wimage = GTK_IS_IMAGE (c1->widget)
+    ? GTK_IMAGE (c1->widget) : GTK_IMAGE (c2->widget);
+  GtkLabel *wlbl = GTK_IS_LABEL (c1->widget)
+    ? GTK_LABEL (c1->widget) : GTK_LABEL (c2->widget);
+  GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label
+    (gtk_label_get_text (wlbl));
+
   GtkWidget *wmenuimage;
 
   if (gtk_button_get_use_stock (wbutton))
@@ -3522,7 +3540,6 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
                                            GTK_ICON_SIZE_MENU);
   else
     {
-      GtkImage *wimage = GTK_IMAGE (gtk_bin_get_child (GTK_BIN (wbutton)));
       GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (wbutton));
       GtkImageType store_type = gtk_image_get_storage_type (wimage);
 
@@ -3761,7 +3778,9 @@ xg_pack_tool_bar (f)
 
   gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget,
                          vbox_pos);
-  gtk_widget_show_all (x->handlebox_widget);
+
+  gtk_widget_show (x->toolbar_widget);
+  gtk_widget_show (x->handlebox_widget);
 }
 
 /* Create a tool bar for frame F.  */
@@ -3777,13 +3796,6 @@ xg_create_tool_bar (f)
 
   gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar");
 
-  /* We only have icons, so override any user setting.  We could
-     use the caption property of the toolbar item (see update_frame_tool_bar
-     below), but some of those strings are long, making the toolbar so
-     long it does not fit on the screen.  The GtkToolbar widget makes every
-     item equal size, so the longest caption determine the size of every
-     tool bar item.  I think the creators of the GtkToolbar widget
-     counted on 4 or 5 character long strings.  */
   gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
   gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget),
                                GTK_ORIENTATION_HORIZONTAL);
@@ -3826,6 +3838,131 @@ find_rtl_image (f, image, rtl)
   return image;
 }
 
+static GtkToolItem *
+xg_make_tool_item (FRAME_PTR f,
+                   GtkWidget *wimage,
+                   GtkWidget **wbutton,
+                   char *label,
+                   int i)
+{
+  GtkToolItem *ti = gtk_tool_item_new ();
+  GtkWidget *vb = EQ (Vtool_bar_style, Qboth_horiz)
+    ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0);
+  GtkWidget *wb = gtk_button_new ();
+  GtkWidget *weventbox = gtk_event_box_new ();
+
+  if (wimage)
+    gtk_box_pack_start_defaults (GTK_BOX (vb), wimage);
+
+  gtk_box_pack_start_defaults (GTK_BOX (vb), gtk_label_new (label));
+  gtk_button_set_focus_on_click (GTK_BUTTON (wb), FALSE);
+  gtk_button_set_relief (GTK_BUTTON (wb), GTK_RELIEF_NONE);
+  gtk_container_add (GTK_CONTAINER (wb), vb);
+  gtk_container_add (GTK_CONTAINER (weventbox), wb);
+  gtk_container_add (GTK_CONTAINER (ti), weventbox);
+
+  if (wimage)
+    {
+      /* The EMACS_INT cast avoids a warning. */
+      g_signal_connect (G_OBJECT (ti), "create-menu-proxy",
+                        G_CALLBACK (xg_tool_bar_menu_proxy),
+                        (gpointer) (EMACS_INT) i);
+
+      g_signal_connect (G_OBJECT (wb), "clicked",
+                        G_CALLBACK (xg_tool_bar_callback),
+                        (gpointer) (EMACS_INT) i);
+
+      g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f);
+
+      /* Catch expose events to overcome an annoying redraw bug, see
+         comment for xg_tool_bar_item_expose_callback.  */
+      g_signal_connect (G_OBJECT (ti),
+                        "expose-event",
+                        G_CALLBACK (xg_tool_bar_item_expose_callback),
+                        0);
+
+      gtk_tool_item_set_homogeneous (ti, FALSE);
+
+      /* Callback to save modifyer mask (Shift/Control, etc).  GTK makes
+         no distinction based on modifiers in the activate callback,
+         so we have to do it ourselves.  */
+      g_signal_connect (wb, "button-release-event",
+                        G_CALLBACK (xg_tool_bar_button_cb),
+                        NULL);
+
+      g_object_set_data (G_OBJECT (wb), XG_FRAME_DATA, (gpointer)f);
+          
+      /* Use enter/leave notify to show help.  We use the events
+         rather than the GtkButton specific signals "enter" and
+         "leave", so we can have only one callback.  The event
+         will tell us what kind of event it is.  */
+      /* The EMACS_INT cast avoids a warning. */
+      g_signal_connect (G_OBJECT (weventbox),
+                        "enter-notify-event",
+                        G_CALLBACK (xg_tool_bar_help_callback),
+                        (gpointer) (EMACS_INT) i);
+      g_signal_connect (G_OBJECT (weventbox),
+                        "leave-notify-event",
+                        G_CALLBACK (xg_tool_bar_help_callback),
+                        (gpointer) (EMACS_INT) i);
+    }
+  
+  if (wbutton) *wbutton = wb;
+
+  return ti;
+}
+
+static void
+xg_show_toolbar_item (GtkToolItem *ti)
+{
+  Lisp_Object style = Ftool_bar_get_system_style ();
+
+  int show_label = EQ (style, Qboth)
+    || EQ (style, Qboth_horiz) || EQ (style, Qtext);
+  int show_image = ! EQ (style, Qtext);
+  int horiz = EQ (style, Qboth_horiz);
+
+  GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (ti));
+  GtkWidget *wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
+  GtkBox *vb = GTK_BOX (gtk_bin_get_child (GTK_BIN (wbutton)));
+  GtkBoxChild *c1 = (GtkBoxChild *) vb->children->data;
+  GtkBoxChild *c2 = (GtkBoxChild *) vb->children->next->data;
+  GtkWidget *wimage = GTK_IS_IMAGE (c1->widget)
+    ? c1->widget : c2->widget;
+  GtkWidget *wlbl = GTK_IS_LABEL (c1->widget)
+    ? c1->widget : c2->widget;
+  GtkWidget *new_box = NULL;
+
+  if (GTK_IS_VBOX (vb) && horiz)
+    new_box = gtk_hbox_new (FALSE, 0);
+  else if (GTK_IS_HBOX (vb) && !horiz && show_label && show_image)
+    new_box = gtk_vbox_new (FALSE, 0);
+  if (new_box)
+    {
+      gtk_widget_ref (wimage);
+      gtk_widget_ref (wlbl);
+      gtk_container_remove (GTK_CONTAINER (vb), wimage);
+      gtk_container_remove (GTK_CONTAINER (vb), wlbl);
+      gtk_widget_destroy (GTK_WIDGET (vb));
+      gtk_box_pack_start_defaults (GTK_BOX (new_box), wimage);
+      gtk_box_pack_start_defaults (GTK_BOX (new_box), wlbl);
+      gtk_container_add (GTK_CONTAINER (wbutton), new_box);
+      gtk_widget_unref (wimage);
+      gtk_widget_unref (wlbl);
+      vb = GTK_BOX (new_box);
+    }
+
+  if (show_label) gtk_widget_show (wlbl);
+  else gtk_widget_hide (wlbl);
+  if (show_image) gtk_widget_show (wimage);
+  else gtk_widget_hide (wimage);
+  gtk_widget_show (GTK_WIDGET (weventbox));
+  gtk_widget_show (GTK_WIDGET (vb));
+  gtk_widget_show (GTK_WIDGET (wbutton));
+  gtk_widget_show (GTK_WIDGET (ti));
+}
+
+
 /* Update the tool bar for frame F.  Add new buttons and remove old.  */
 
 extern Lisp_Object Qx_gtk_map_stock;
@@ -3877,8 +4014,8 @@ update_frame_tool_bar (f)
 
   wtoolbar = GTK_TOOLBAR (x->toolbar_widget);
   gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req);
-  dir = gtk_widget_get_direction (x->toolbar_widget);
-
+  dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar));
+  
   for (i = 0; i < f->n_tool_bar_items; ++i)
     {
       int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
@@ -3896,8 +4033,10 @@ update_frame_tool_bar (f)
       GtkWidget *wbutton = NULL;
       GtkWidget *weventbox;
       Lisp_Object specified_file;
-
-      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);
+      Lisp_Object lbl = PROP (TOOL_BAR_ITEM_LABEL);
+      char *label = SSDATA (PROP (TOOL_BAR_ITEM_LABEL));
+      
+      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i);
 
       if (ti)
         {
@@ -3905,6 +4044,7 @@ update_frame_tool_bar (f)
           wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
         }
 
+
       image = PROP (TOOL_BAR_ITEM_IMAGES);
 
       /* Ignore invalid image specifications.  */
@@ -3936,7 +4076,7 @@ update_frame_tool_bar (f)
                 icon_size = gtk_toolbar_get_icon_size (wtoolbar);
             }
           else if (gtk_stock_lookup (SSDATA (stock), &stock_item))
-              icon_size = gtk_toolbar_get_icon_size (wtoolbar);
+            icon_size = gtk_toolbar_get_icon_size (wtoolbar);
           else
             {
               stock = Qnil;
@@ -3980,22 +4120,15 @@ update_frame_tool_bar (f)
 
           if (img->load_failed_p || img->pixmap == None)
             {
-                if (ti)
-                    gtk_widget_hide_all (GTK_WIDGET (ti));
-                else
+              if (ti)
+                gtk_widget_hide_all (GTK_WIDGET (ti));
+              else
                 {
-                    /* Insert an empty (non-image) button */
-                    weventbox = gtk_event_box_new ();
-                    wbutton = gtk_button_new ();
-                    gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE);
-                    gtk_button_set_relief (GTK_BUTTON (wbutton),
-                                           GTK_RELIEF_NONE);
-                    gtk_container_add (GTK_CONTAINER (weventbox), wbutton);
-                    ti = gtk_tool_item_new ();
-                    gtk_container_add (GTK_CONTAINER (ti), weventbox);
-                    gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, -1);
+                  /* Insert an empty (non-image) button */
+                  ti = xg_make_tool_item (f, NULL, NULL, "", i);
+                  gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
                 }
-                continue;
+              continue;
             }
         }
 
@@ -4026,73 +4159,27 @@ update_frame_tool_bar (f)
             }
 
           gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
-          wbutton = gtk_button_new ();
-          gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE);
-          gtk_button_set_relief (GTK_BUTTON (wbutton), GTK_RELIEF_NONE);
-          gtk_container_add (GTK_CONTAINER (wbutton), w);
-          weventbox = gtk_event_box_new ();
-          gtk_container_add (GTK_CONTAINER (weventbox), wbutton);
-          ti = gtk_tool_item_new ();
-          gtk_container_add (GTK_CONTAINER (ti), weventbox);
-          gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, -1);
-
-
-          /* The EMACS_INT cast avoids a warning. */
-          g_signal_connect (G_OBJECT (ti), "create-menu-proxy",
-                            G_CALLBACK (xg_tool_bar_menu_proxy),
-                            (gpointer) (EMACS_INT) i);
-
-          g_signal_connect (G_OBJECT (wbutton), "clicked",
-                            G_CALLBACK (xg_tool_bar_callback),
-                            (gpointer) (EMACS_INT) i);
-
-          gtk_widget_show_all (GTK_WIDGET (ti));
-
-
-          g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f);
-
-          /* Catch expose events to overcome an annoying redraw bug, see
-             comment for xg_tool_bar_item_expose_callback.  */
-          g_signal_connect (G_OBJECT (ti),
-                            "expose-event",
-                            G_CALLBACK (xg_tool_bar_item_expose_callback),
-                            0);
-
+          ti = xg_make_tool_item (f, w, &wbutton, label, i);
+          gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
           gtk_widget_set_sensitive (wbutton, enabled_p);
-          gtk_tool_item_set_homogeneous (ti, FALSE);
-
-          /* Callback to save modifyer mask (Shift/Control, etc).  GTK makes
-             no distinction based on modifiers in the activate callback,
-             so we have to do it ourselves.  */
-          g_signal_connect (wbutton, "button-release-event",
-                            G_CALLBACK (xg_tool_bar_button_cb),
-                            NULL);
-
-          g_object_set_data (G_OBJECT (wbutton), XG_FRAME_DATA, (gpointer)f);
-          
-          /* Use enter/leave notify to show help.  We use the events
-             rather than the GtkButton specific signals "enter" and
-             "leave", so we can have only one callback.  The event
-             will tell us what kind of event it is.  */
-          /* The EMACS_INT cast avoids a warning. */
-          g_signal_connect (G_OBJECT (weventbox),
-                            "enter-notify-event",
-                            G_CALLBACK (xg_tool_bar_help_callback),
-                            (gpointer) (EMACS_INT) i);
-          g_signal_connect (G_OBJECT (weventbox),
-                            "leave-notify-event",
-                            G_CALLBACK (xg_tool_bar_help_callback),
-                            (gpointer) (EMACS_INT) i);
         }
       else
         {
-          GtkWidget *wimage = gtk_bin_get_child (GTK_BIN (wbutton));
+          GtkBox *vb = GTK_BOX (gtk_bin_get_child (GTK_BIN (wbutton)));
+          GtkBoxChild *c1 = (GtkBoxChild *) vb->children->data;
+          GtkBoxChild *c2 = (GtkBoxChild *) vb->children->next->data;
+          GtkWidget *wimage = GTK_IS_IMAGE (c1->widget)
+            ? c1->widget : c2->widget;
+          GtkWidget *wlbl = GTK_IS_LABEL (c1->widget)
+            ? c1->widget : c2->widget;
+
           Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
                                                       XG_TOOL_BAR_IMAGE_DATA);
           gpointer old_stock_name = g_object_get_data (G_OBJECT (wimage),
                                                        XG_TOOL_BAR_STOCK_NAME);
           gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage),
                                                       XG_TOOL_BAR_ICON_NAME);
+          gtk_label_set_text (GTK_LABEL (wlbl), label);
           if (stock_name &&
               (! old_stock_name || strcmp (old_stock_name, stock_name) != 0))
             {
@@ -4103,7 +4190,8 @@ update_frame_tool_bar (f)
                                       (GDestroyNotify) xfree);
               g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
                                  NULL);
-              g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL);
+              g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
+                                 NULL);
             }
           else if (icon_name &&
                    (! old_icon_name || strcmp (old_icon_name, icon_name) != 0))
@@ -4126,14 +4214,15 @@ update_frame_tool_bar (f)
 
               g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
                                  NULL);
-              g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL);
+              g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
+                                 NULL);
             }
 
           gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin);
 
           gtk_widget_set_sensitive (wbutton, enabled_p);
-          gtk_widget_show_all (GTK_WIDGET (ti));
-       }
+        }
+      xg_show_toolbar_item (ti);
 
 #undef PROP
     }
@@ -4142,16 +4231,16 @@ update_frame_tool_bar (f)
      can be reused later on.  */
   do
     {
-      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i++);
+      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i++);
       if (ti) gtk_widget_hide_all (GTK_WIDGET (ti));
     } while (ti != NULL);
 
   new_req.height = 0;
   if (pack_tool_bar && f->n_tool_bar_items != 0)
-      xg_pack_tool_bar (f);
+    xg_pack_tool_bar (f);
   
 
-  gtk_widget_size_request (GTK_WIDGET (x->toolbar_widget), &new_req);
+  gtk_widget_size_request (GTK_WIDGET (wtoolbar), &new_req);
   if (old_req.height != new_req.height
       && ! FRAME_X_OUTPUT (f)->toolbar_detached)
     {
@@ -4195,7 +4284,7 @@ free_frame_tool_bar (f)
 
 /***********************************************************************
                       Initializing
- ***********************************************************************/
+***********************************************************************/
 void
 xg_initialize ()
 {
diff --git a/src/image.c b/src/image.c
index 8159575e640..5865d7be00a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7961,7 +7961,7 @@ imagemagick_load_image (f, img, contents, size, filename)
 
 DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0,0,0,
        doc: /* Return image file types supported by ImageMagick.
-             Since ImageMagic recognizes a lot of file-types that clash with Emacs,
+             Since ImageMagick recognizes a lot of file-types that clash with Emacs,
             such as .c, we want to be able to alter the list at the lisp level.  */)
   ()
 {
diff --git a/src/insdel.c b/src/insdel.c
index ededd597b0d..6cc797a12ff 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -54,7 +54,7 @@ static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
 Lisp_Object Fcombine_after_change_execute ();
 
 /* Non-nil means don't call the after-change-functions right away,
-   just record an element in Vcombine_after_change_calls_list.  */
+   just record an element in combine_after_change_list.  */
 Lisp_Object Vcombine_after_change_calls;
 
 /* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
diff --git a/src/keyboard.c b/src/keyboard.c
index f2aeff89542..74efb856852 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -496,7 +496,7 @@ Lisp_Object Qevent_symbol_elements;
 /* menu item parts */
 Lisp_Object Qmenu_enable;
 Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence;
-Lisp_Object QCbutton, QCtoggle, QCradio;
+Lisp_Object QCbutton, QCtoggle, QCradio, QClabel;
 extern Lisp_Object Qmenu_item;
 
 /* An event header symbol HEAD may have a property named
@@ -1520,7 +1520,6 @@ Lisp_Object
 command_loop_1 ()
 {
   Lisp_Object cmd;
-  int lose;
   Lisp_Object keybuf[30];
   int i;
   int prev_modiff = 0;
@@ -8249,7 +8248,11 @@ process_tool_bar_item (key, def, data, args)
 
    - `:help HELP-STRING'.
 
-   Gives a help string to display for the tool bar item.  */
+   Gives a help string to display for the tool bar item.
+
+   - `:label LABEL-STRING'.
+
+   A text label to show with the tool bar button if labels are enabled.  */
 
 static int
 parse_tool_bar_item (key, item)
@@ -8260,7 +8263,7 @@ parse_tool_bar_item (key, item)
 
   Lisp_Object filter = Qnil;
   Lisp_Object caption;
-  int i;
+  int i, have_label = 0;
 
   /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'.
      Rule out items that aren't lists, don't start with
@@ -8338,6 +8341,12 @@ parse_tool_bar_item (key, item)
       else if (EQ (key, QChelp))
         /* `:help HELP-STRING'.  */
         PROP (TOOL_BAR_ITEM_HELP) = value;
+      else if (EQ (key, QClabel))
+        {
+          /* `:label LABEL-STRING'.  */
+          PROP (TOOL_BAR_ITEM_LABEL) = value;
+          have_label = 1;
+        }
       else if (EQ (key, QCfilter))
         /* ':filter FORM'.  */
         filter = value;
@@ -8365,6 +8374,49 @@ parse_tool_bar_item (key, item)
         PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value;
     }
 
+
+  if (!have_label)
+    {
+      /* Try to make one from caption and key.  */
+      Lisp_Object key = PROP (TOOL_BAR_ITEM_KEY);
+      Lisp_Object capt = PROP (TOOL_BAR_ITEM_CAPTION);
+      char *label = SYMBOLP (key) ? (char *) SDATA (SYMBOL_NAME (key)) : "";
+      char *caption = STRINGP (capt) ? (char *) SDATA (capt) : "";
+      char buf[64];
+      EMACS_INT max_lbl = 2*tool_bar_max_label_size;
+      Lisp_Object new_lbl;
+
+      if (strlen (caption) < max_lbl && caption[0] != '\0') 
+        {
+          strcpy (buf, caption);
+          while (buf[0] != '\0' &&  buf[strlen (buf) -1] == '.')
+            buf[strlen (buf)-1] = '\0';
+          if (strlen (buf) <= max_lbl)
+            caption = buf;
+        }
+
+      if (strlen (caption) <= max_lbl)
+        label = caption;
+
+      if (strlen (label) <= max_lbl && label[0] != '\0') 
+        {
+          int i;
+          if (label != buf) strcpy (buf, label);
+
+          for (i = 0; i < strlen (buf); ++i) 
+            {
+              if (buf[i] == '-') buf[i] = ' ';
+            }
+          label = buf;
+      
+        }
+      else label = "";
+
+      new_lbl = Fupcase_initials (make_string (label, strlen (label)));
+      if (SCHARS (new_lbl) <= tool_bar_max_label_size)
+        PROP (TOOL_BAR_ITEM_LABEL) = new_lbl;
+    }
+
   /* If got a filter apply it on binding.  */
   if (!NILP (filter))
     PROP (TOOL_BAR_ITEM_BINDING)
@@ -11700,6 +11752,8 @@ syms_of_keyboard ()
   staticpro (&QCtoggle);
   QCradio = intern_c_string (":radio");
   staticpro (&QCradio);
+  QClabel = intern_c_string (":label");
+  staticpro (&QClabel);
 
   Qmode_line = intern_c_string ("mode-line");
   staticpro (&Qmode_line);
diff --git a/src/lisp.h b/src/lisp.h
index 7f5d5df66c6..7d329cc754c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -223,13 +223,7 @@ enum Lisp_Misc_Type
   {
     Lisp_Misc_Free = 0x5eab,
     Lisp_Misc_Marker,
-    Lisp_Misc_Intfwd,
-    Lisp_Misc_Boolfwd,
-    Lisp_Misc_Objfwd,
-    Lisp_Misc_Buffer_Objfwd,
-    Lisp_Misc_Buffer_Local_Value,
     Lisp_Misc_Overlay,
-    Lisp_Misc_Kboard_Objfwd,
     Lisp_Misc_Save_Value,
     /* Currently floats are not a misc type,
        but let's define this in case we want to change that.  */
@@ -238,6 +232,18 @@ enum Lisp_Misc_Type
     Lisp_Misc_Limit
   };
 
+/* These are the types of forwarding objects used in the value slot
+   of symbols for special built-in variables whose value is stored in
+   C variables.  */
+enum Lisp_Fwd_Type
+  {
+    Lisp_Fwd_Int,               /* Fwd to a C `int' variable.  */
+    Lisp_Fwd_Bool,              /* Fwd to a C boolean var.  */
+    Lisp_Fwd_Obj,               /* Fwd to a C Lisp_Object variable.  */
+    Lisp_Fwd_Buffer_Obj,        /* Fwd to a Lisp_Object field of buffers.  */
+    Lisp_Fwd_Kboard_Obj,        /* Fwd to a Lisp_Object field of kboards.  */
+  };
+
 #ifndef GCTYPEBITS
 #define GCTYPEBITS 3
 #endif
@@ -566,17 +572,19 @@ extern size_t pure_size;
 #define XMISCANY(a)     (eassert (MISCP (a)), &(XMISC(a)->u_any))
 #define XMISCTYPE(a)   (XMISCANY (a)->type)
 #define XMARKER(a)      (eassert (MARKERP (a)), &(XMISC(a)->u_marker))
-#define XINTFWD(a)      (eassert (INTFWDP (a)), &(XMISC(a)->u_intfwd))
-#define XBOOLFWD(a)     (eassert (BOOLFWDP (a)), &(XMISC(a)->u_boolfwd))
-#define XOBJFWD(a)      (eassert (OBJFWDP (a)), &(XMISC(a)->u_objfwd))
 #define XOVERLAY(a)     (eassert (OVERLAYP (a)), &(XMISC(a)->u_overlay))
 #define XSAVE_VALUE(a)  (eassert (SAVE_VALUEP (a)), &(XMISC(a)->u_save_value))
+
+/* Forwarding object types.  */
+
+#define XFWDTYPE(a)     (a->u_intfwd.type)
+#define XINTFWD(a)      (eassert (INTFWDP (a)), &((a)->u_intfwd))
+#define XBOOLFWD(a)     (eassert (BOOLFWDP (a)), &((a)->u_boolfwd))
+#define XOBJFWD(a)      (eassert (OBJFWDP (a)), &((a)->u_objfwd))
 #define XBUFFER_OBJFWD(a) \
-  (eassert (BUFFER_OBJFWDP (a)), &(XMISC(a)->u_buffer_objfwd))
-#define XBUFFER_LOCAL_VALUE(a) \
-  (eassert (BUFFER_LOCAL_VALUEP (a)), &(XMISC(a)->u_buffer_local_value))
+  (eassert (BUFFER_OBJFWDP (a)), &((a)->u_buffer_objfwd))
 #define XKBOARD_OBJFWD(a) \
-  (eassert (KBOARD_OBJFWDP (a)), &(XMISC(a)->u_kboard_objfwd))
+  (eassert (KBOARD_OBJFWDP (a)), &((a)->u_kboard_objfwd))
 
 /* Pseudovector types.  */
 
@@ -713,11 +721,6 @@ struct Lisp_Cons
 #define XSETCAR(c,n) (XCAR_AS_LVALUE(c) = (n))
 #define XSETCDR(c,n) (XCDR_AS_LVALUE(c) = (n))
 
-/* For performance: Fast storage of positive integers into the
-   fields of a cons cell.  See above caveats.  */
-#define XSETCARFASTINT(c,n)  XSETFASTINT(XCAR_AS_LVALUE(c),(n))
-#define XSETCDRFASTINT(c,n)  XSETFASTINT(XCDR_AS_LVALUE(c),(n))
-
 /* Take the car or cdr of something whose type is not known.  */
 #define CAR(c)                                  \
  (CONSP ((c)) ? XCAR ((c))                      \
@@ -988,19 +991,32 @@ enum symbol_interned
   SYMBOL_INTERNED_IN_INITIAL_OBARRAY = 2
 };
 
+enum symbol_redirect
+{
+  SYMBOL_PLAINVAL  = 4,
+  SYMBOL_VARALIAS  = 1,
+  SYMBOL_LOCALIZED = 2,
+  SYMBOL_FORWARDED   = 3
+};
+
 /* In a symbol, the markbit of the plist is used as the gc mark bit */
 
 struct Lisp_Symbol
 {
   unsigned gcmarkbit : 1;
 
-  /* Non-zero means symbol serves as a variable alias.  The symbol
-     holding the real value is found in the value slot.  */
-  unsigned indirect_variable : 1;
+  /* Indicates where the value can be found:
+     0 : it's a plain var, the value is in the `value' field.
+     1 : it's a varalias, the value is really in the `alias' symbol.
+     2 : it's a localized var, the value is in the `blv' object.
+     3 : it's a forwarding variable, the value is in `forward'.
+   */
+  enum symbol_redirect redirect : 3;
 
   /* Non-zero means symbol is constant, i.e. changing its value
-     should signal an error.  */
-  unsigned constant : 1;
+     should signal an error.  If the value is 3, then the var
+     can be changed, but only by `defconst'.  */
+  unsigned constant : 2;
 
   /* Interned state of the symbol.  This is an enumerator from
      enum symbol_interned.  */
@@ -1013,10 +1029,15 @@ struct Lisp_Symbol
   Lisp_Object xname;
 
   /* Value of the symbol or Qunbound if unbound.  If this symbol is a
-     defvaralias, `value' contains the symbol for which it is an
+     defvaralias, `alias' contains the symbol for which it is an
      alias.  Use the SYMBOL_VALUE and SET_SYMBOL_VALUE macros to get
      and set a symbol's value, to take defvaralias into account.  */
-  Lisp_Object value;
+  union {
+    Lisp_Object value;
+    struct Lisp_Symbol *alias;
+    struct Lisp_Buffer_Local_Value *blv;
+    union Lisp_Fwd *fwd;
+  } val;
 
   /* Function value of the symbol or Qunbound if not fboundp.  */
   Lisp_Object function;
@@ -1030,6 +1051,23 @@ struct Lisp_Symbol
 
 /* Value is name of symbol.  */
 
+#define SYMBOL_VAL(sym)   \
+  (eassert ((sym)->redirect == SYMBOL_PLAINVAL),  (sym)->val.value)
+#define SYMBOL_ALIAS(sym) \
+  (eassert ((sym)->redirect == SYMBOL_VARALIAS),  (sym)->val.alias)
+#define SYMBOL_BLV(sym)   \
+  (eassert ((sym)->redirect == SYMBOL_LOCALIZED), (sym)->val.blv)
+#define SYMBOL_FWD(sym)   \
+  (eassert ((sym)->redirect == SYMBOL_FORWARDED), (sym)->val.fwd)
+#define SET_SYMBOL_VAL(sym, v)     \
+  (eassert ((sym)->redirect == SYMBOL_PLAINVAL),  (sym)->val.value = (v))
+#define SET_SYMBOL_ALIAS(sym, v)   \
+  (eassert ((sym)->redirect == SYMBOL_VARALIAS),  (sym)->val.alias = (v))
+#define SET_SYMBOL_BLV(sym, v)     \
+  (eassert ((sym)->redirect == SYMBOL_LOCALIZED), (sym)->val.blv = (v))
+#define SET_SYMBOL_FWD(sym, v) \
+  (eassert ((sym)->redirect == SYMBOL_FORWARDED), (sym)->val.fwd = (v))
+
 #define SYMBOL_NAME(sym)  \
      LISP_MAKE_RVALUE (XSYMBOL (sym)->xname)
 
@@ -1049,24 +1087,6 @@ struct Lisp_Symbol
 
 #define SYMBOL_CONSTANT_P(sym)   XSYMBOL (sym)->constant
 
-/* Value is the value of SYM, with defvaralias taken into
-   account.  */
-
-#define SYMBOL_VALUE(sym)                       \
-   (XSYMBOL (sym)->indirect_variable            \
-    ? indirect_variable (XSYMBOL (sym))->value  \
-    : XSYMBOL (sym)->value)
-
-/* Set SYM's value to VAL, taking defvaralias into account.  */
-
-#define SET_SYMBOL_VALUE(sym, val)                              \
-     do {                                                       \
-       if (XSYMBOL (sym)->indirect_variable)                    \
-         indirect_variable (XSYMBOL (sym))->value = (val);      \
-       else                                                     \
-         XSYMBOL (sym)->value = (val);                          \
-     } while (0)
-
 
 /***********************************************************************
                              Hash Tables
@@ -1200,9 +1220,11 @@ struct Lisp_Hash_Table
 
 struct Lisp_Misc_Any            /* Supertype of all Misc types.  */
 {
-  enum Lisp_Misc_Type type : 16;                /* = Lisp_Misc_Marker */
+  enum Lisp_Misc_Type type : 16;                /* = Lisp_Misc_??? */
   unsigned gcmarkbit : 1;
   int spacer : 15;
+  /* Make it as long as "Lisp_Free without padding". */
+  void *fill;
 };
 
 struct Lisp_Marker
@@ -1225,7 +1247,7 @@ struct Lisp_Marker
      - Fmarker_buffer
      - Fset_marker: check eq(oldbuf, newbuf) to avoid unchain+rechain.
      - unchain_marker: to find the list from which to unchain.
-     - Fkill_buffer: to unchain the markers of current indirect buffer.
+     - Fkill_buffer: to only unchain the markers of current indirect buffer.
      */
   struct buffer *buffer;
 
@@ -1239,7 +1261,10 @@ struct Lisp_Marker
   struct Lisp_Marker *next;
   /* This is the char position where the marker points.  */
   EMACS_INT charpos;
-  /* This is the byte position.  */
+  /* This is the byte position.
+     It's mostly used as a charpos<->bytepos cache (i.e. it's not directly
+     used to implement the functionality of markers, but rather to (ab)use
+     markers as a cache for char<->byte mappings).  */
   EMACS_INT bytepos;
 };
 
@@ -1249,9 +1274,7 @@ struct Lisp_Marker
    specified int variable.  */
 struct Lisp_Intfwd
   {
-    int type : 16;      /* = Lisp_Misc_Intfwd */
-    unsigned gcmarkbit : 1;
-    int spacer : 15;
+    enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Int */
     EMACS_INT *intvar;
   };
 
@@ -1261,9 +1284,7 @@ struct Lisp_Intfwd
    nil if it is zero.  */
 struct Lisp_Boolfwd
   {
-    int type : 16;      /* = Lisp_Misc_Boolfwd */
-    unsigned gcmarkbit : 1;
-    int spacer : 15;
+    enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Bool */
     int *boolvar;
   };
 
@@ -1273,9 +1294,7 @@ struct Lisp_Boolfwd
    specified variable.  */
 struct Lisp_Objfwd
   {
-    int type : 16;      /* = Lisp_Misc_Objfwd */
-    unsigned gcmarkbit : 1;
-    int spacer : 15;
+    enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Obj */
     Lisp_Object *objvar;
   };
 
@@ -1283,11 +1302,9 @@ struct Lisp_Objfwd
    current buffer.  Value is byte index of slot within buffer.  */
 struct Lisp_Buffer_Objfwd
   {
-    int type : 16;      /* = Lisp_Misc_Buffer_Objfwd */
-    unsigned gcmarkbit : 1;
-    int spacer : 15;
-    Lisp_Object slottype; /* Qnil, Lisp_Int, Lisp_Symbol, or Lisp_String.  */
+    enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Buffer_Obj */
     int offset;
+    Lisp_Object slottype; /* Qnil, Lisp_Int, Lisp_Symbol, or Lisp_String.  */
   };
 
 /* struct Lisp_Buffer_Local_Value is used in a symbol value cell when
@@ -1316,48 +1333,51 @@ struct Lisp_Buffer_Objfwd
 
 struct Lisp_Buffer_Local_Value
   {
-    int type : 16;      /* = Lisp_Misc_Buffer_Local_Value  */
-    unsigned gcmarkbit : 1;
-    int spacer : 11;
-
     /* 1 means that merely setting the variable creates a local
        binding for the current buffer */
     unsigned int local_if_set : 1;
-    /* 1 means this variable is allowed to have frame-local bindings,
-       so check for them when looking for the proper binding.  */
-    unsigned int check_frame : 1;
-    /* 1 means that the binding now loaded was found
-       as a local binding for the buffer in the `buffer' slot.  */
-    unsigned int found_for_buffer : 1;
-    /* 1 means that the binding now loaded was found
-       as a local binding for the frame in the `frame' slot.  */
-    unsigned int found_for_frame : 1;
-    Lisp_Object realvalue;
-    /* The buffer and frame for which the loaded binding was found.  */
-    /* Having both is only needed if we want to allow variables that are
-       both buffer local and frame local (in which case, we currently give
-       precedence to the buffer-local binding).  I don't think such
-       a combination is desirable.  --Stef  */
-    Lisp_Object buffer, frame;
-
-    /* A cons cell, (LOADED-BINDING . DEFAULT-VALUE).
-
-       LOADED-BINDING is the binding now loaded.  It is a cons cell
-       whose cdr is the binding's value.  The cons cell may be an
-       element of a buffer's local-variable alist, or an element of a
-       frame's parameter alist, or it may be this cons cell.
-
-       DEFAULT-VALUE is the variable's default value, seen when the
-       current buffer and selected frame do not have their own
-       bindings for the variable.  When the default binding is loaded,
-       LOADED-BINDING is actually this very cons cell; thus, its car
-       points to itself.  */
-    Lisp_Object cdr;
+    /* 1 means this variable can have frame-local bindings, otherwise, it is
+       can have buffer-local bindings.  The two cannot be combined.  */
+    unsigned int frame_local : 1;
+    /* 1 means that the binding now loaded was found.
+       Presumably equivalent to (defcell!=valcell) */
+    unsigned int found : 1;
+    /* If non-NULL, a forwarding to the C var where it should also be set.  */
+    union Lisp_Fwd *fwd;        /* Should never be (Buffer|Kboard)_Objfwd.  */
+    /* The buffer or frame for which the loaded binding was found.  */
+    Lisp_Object where;
+    /* A cons cell that holds the default value.  It has the form
+       (SYMBOL . DEFAULT-VALUE).  */
+    Lisp_Object defcell;
+    /* The cons cell from `where's parameter alist.
+       It always has the form (SYMBOL . VALUE)
+       Note that if `forward' is non-nil, VALUE may be out of date.
+       Also if the currently loaded binding is the default binding, then
+       this is `eq'ual to defcell.  */
+    Lisp_Object valcell;
   };
 
+#define BLV_FOUND(blv) \
+  (eassert ((blv)->found == !EQ ((blv)->defcell, (blv)->valcell)), (blv)->found)
+#define SET_BLV_FOUND(blv, v) \
+  (eassert ((v) == !EQ ((blv)->defcell, (blv)->valcell)), (blv)->found = (v))
+
+#define BLV_VALUE(blv) (XCDR ((blv)->valcell))
+#define SET_BLV_VALUE(blv, v) (XSETCDR ((blv)->valcell, v))
+
 /* START and END are markers in the overlay's buffer, and
    PLIST is the overlay's property list.  */
 struct Lisp_Overlay
+/* An overlay's real data content is:
+   - plist
+   - buffer
+   - insertion type of both ends
+   - start & start_byte
+   - end & end_byte
+   - next (singly linked list of overlays).
+   - start_next and end_next (singly linked list of markers).
+   I.e. 9words plus 2 bits, 3words of which are for external linked lists.
+*/
   {
     enum Lisp_Misc_Type type : 16;      /* = Lisp_Misc_Overlay */
     unsigned gcmarkbit : 1;
@@ -1370,9 +1390,7 @@ struct Lisp_Overlay
    current kboard.  */
 struct Lisp_Kboard_Objfwd
   {
-    enum Lisp_Misc_Type type : 16;      /* = Lisp_Misc_Kboard_Objfwd */
-    unsigned gcmarkbit : 1;
-    int spacer : 15;
+    enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Kboard_Obj */
     int offset;
   };
 
@@ -1401,9 +1419,9 @@ struct Lisp_Free
 #ifdef USE_LSB_TAG
     /* Try to make sure that sizeof(Lisp_Misc) preserves TYPEBITS-alignment.
        This assumes that Lisp_Marker is the largest of the alternatives and
-       that Lisp_Intfwd has the same size as "Lisp_Free w/o padding".  */
+       that Lisp_Misc_Any has the same size as "Lisp_Free w/o padding".  */
     char padding[((((sizeof (struct Lisp_Marker) - 1) >> GCTYPEBITS) + 1)
-                  << GCTYPEBITS) - sizeof (struct Lisp_Intfwd)];
+                  << GCTYPEBITS) - sizeof (struct Lisp_Misc_Any)];
 #endif
   };
 
@@ -1414,15 +1432,18 @@ union Lisp_Misc
   {
     struct Lisp_Misc_Any u_any;    /* Supertype of all Misc types.  */
     struct Lisp_Free u_free;       /* Includes padding to force alignment.  */
-    struct Lisp_Marker u_marker;
-    struct Lisp_Intfwd u_intfwd;
-    struct Lisp_Boolfwd u_boolfwd;
-    struct Lisp_Objfwd u_objfwd;
-    struct Lisp_Buffer_Objfwd u_buffer_objfwd;
-    struct Lisp_Buffer_Local_Value u_buffer_local_value;
-    struct Lisp_Overlay u_overlay;
-    struct Lisp_Kboard_Objfwd u_kboard_objfwd;
-    struct Lisp_Save_Value u_save_value;
+    struct Lisp_Marker u_marker;                         /* 5 */
+    struct Lisp_Overlay u_overlay;                       /* 5 */
+    struct Lisp_Save_Value u_save_value;                 /* 3 */
+  };
+
+union Lisp_Fwd
+  {
+    struct Lisp_Intfwd u_intfwd;                         /* 2 */
+    struct Lisp_Boolfwd u_boolfwd;                       /* 2 */
+    struct Lisp_Objfwd u_objfwd;                         /* 2 */
+    struct Lisp_Buffer_Objfwd u_buffer_objfwd;           /* 2 */
+    struct Lisp_Kboard_Objfwd u_kboard_objfwd;           /* 2 */
   };
 
 /* Lisp floating point type */
@@ -1564,15 +1585,13 @@ typedef struct {
 #define VECTORP(x)    (VECTORLIKEP (x) && !(XVECTOR (x)->size & PSEUDOVECTOR_FLAG))
 #define OVERLAYP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Overlay)
 #define MARKERP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Marker)
-#define INTFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Intfwd)
-#define BOOLFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Boolfwd)
-#define OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd)
-#define BUFFER_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Objfwd)
-#define BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
-#define SOME_BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Some_Buffer_Local_Value)
-#define KBOARD_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
 #define SAVE_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value)
 
+#define INTFWDP(x) (XFWDTYPE (x) == Lisp_Fwd_Int)
+#define BOOLFWDP(x) (XFWDTYPE (x) == Lisp_Fwd_Bool)
+#define OBJFWDP(x) (XFWDTYPE (x) == Lisp_Fwd_Obj)
+#define BUFFER_OBJFWDP(x) (XFWDTYPE (x) == Lisp_Fwd_Buffer_Obj)
+#define KBOARD_OBJFWDP(x) (XFWDTYPE (x) == Lisp_Fwd_Kboard_Obj)
 
 /* True if object X is a pseudovector whose code is CODE.  */
 #define PSEUDOVECTORP(x, code)                                  \
@@ -1789,24 +1808,44 @@ extern void defsubr P_ ((struct Lisp_Subr *));
 #define MANY -2
 #define UNEVALLED -1
 
-extern void defvar_lisp (const char *, Lisp_Object *);
-extern void defvar_lisp_nopro (const char *, Lisp_Object *);
-extern void defvar_bool (const char *, int *);
-extern void defvar_int (const char *, EMACS_INT *);
-extern void defvar_kboard (const char *, int);
+extern void defvar_lisp (struct Lisp_Objfwd *, const char *, Lisp_Object *);
+extern void defvar_lisp_nopro (struct Lisp_Objfwd *, const char *, Lisp_Object *);
+extern void defvar_bool (struct Lisp_Boolfwd *, const char *, int *);
+extern void defvar_int (struct Lisp_Intfwd *, const char *, EMACS_INT *);
+extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int);
 
 /* Macros we use to define forwarded Lisp variables.
    These are used in the syms_of_FILENAME functions.  */
 
-#define DEFVAR_LISP(lname, vname, doc) defvar_lisp (lname, vname)
-#define DEFVAR_LISP_NOPRO(lname, vname, doc) defvar_lisp_nopro (lname, vname)
-#define DEFVAR_BOOL(lname, vname, doc) defvar_bool (lname, vname)
-#define DEFVAR_INT(lname, vname, doc) defvar_int (lname, vname)
+#define DEFVAR_LISP(lname, vname, doc)          \
+  do {                                          \
+    static struct Lisp_Objfwd o_fwd;            \
+    defvar_lisp (&o_fwd, lname, vname);         \
+  } while (0)
+#define DEFVAR_LISP_NOPRO(lname, vname, doc)    \
+  do {                                          \
+    static struct Lisp_Objfwd o_fwd;            \
+    defvar_lisp_nopro (&o_fwd, lname, vname);   \
+  } while (0)
+#define DEFVAR_BOOL(lname, vname, doc)          \
+  do {                                          \
+    static struct Lisp_Boolfwd b_fwd;           \
+    defvar_bool (&b_fwd, lname, vname);         \
+  } while (0)
+#define DEFVAR_INT(lname, vname, doc)           \
+  do {                                          \
+    static struct Lisp_Intfwd i_fwd;            \
+    defvar_int (&i_fwd, lname, vname);          \
+  } while (0)
 
-#define DEFVAR_KBOARD(lname, vname, doc) \
- defvar_kboard (lname, \
-                (int)((char *)(&current_kboard->vname) \
-                      - (char *)current_kboard))
+#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));            \
+  } while (0)
 
 
 
@@ -2341,13 +2380,11 @@ extern void args_out_of_range P_ ((Lisp_Object, Lisp_Object)) NO_RETURN;
 extern void args_out_of_range_3 P_ ((Lisp_Object, Lisp_Object,
                                      Lisp_Object)) NO_RETURN;
 extern Lisp_Object wrong_type_argument P_ ((Lisp_Object, Lisp_Object)) NO_RETURN;
-extern void store_symval_forwarding P_ ((Lisp_Object, Lisp_Object,
-                                         Lisp_Object, struct buffer *));
-extern Lisp_Object do_symval_forwarding P_ ((Lisp_Object));
-extern Lisp_Object set_internal P_ ((Lisp_Object, Lisp_Object, struct buffer *, int));
+extern Lisp_Object do_symval_forwarding (union Lisp_Fwd *);
+extern void set_internal (Lisp_Object, Lisp_Object, Lisp_Object, int);
 extern void syms_of_data P_ ((void));
 extern void init_data P_ ((void));
-extern void swap_in_global_binding P_ ((Lisp_Object));
+extern void swap_in_global_binding P_ ((struct Lisp_Symbol *));
 
 /* Defined in cmds.c */
 EXFUN (Fend_of_line, 1);
@@ -2593,7 +2630,7 @@ extern Lisp_Object Qinhibit_point_motion_hooks;
 extern Lisp_Object Qinhibit_redisplay, Qdisplay;
 extern Lisp_Object Qinhibit_eval_during_redisplay;
 extern Lisp_Object Qmessage_truncate_lines;
-extern Lisp_Object Qimage;
+extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz;
 extern Lisp_Object Vmessage_log_max;
 extern int message_enable_multibyte;
 extern Lisp_Object echo_area_buffer[2];
@@ -2779,7 +2816,9 @@ extern Lisp_Object intern_c_string (const char *);
 extern Lisp_Object make_symbol P_ ((char *));
 extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int));
 #define LOADHIST_ATTACH(x) \
- if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list)
+  do {                                                                  \
+    if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list); \
+  } while (0)
 extern Lisp_Object Vcurrent_load_list;
 extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes;
 extern int openp P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
@@ -2855,13 +2894,15 @@ extern Lisp_Object call3 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object
 extern Lisp_Object call4 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object));
 extern Lisp_Object call5 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object));
 extern Lisp_Object call6 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object));
+extern Lisp_Object call7 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object));
 EXFUN (Fdo_auto_save, 2);
 extern Lisp_Object apply_lambda P_ ((Lisp_Object, Lisp_Object, int));
 extern Lisp_Object internal_catch P_ ((Lisp_Object, Lisp_Object (*) (Lisp_Object), Lisp_Object));
 extern Lisp_Object internal_lisp_condition_case P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 extern Lisp_Object internal_condition_case P_ ((Lisp_Object (*) (void), Lisp_Object, Lisp_Object (*) (Lisp_Object)));
 extern Lisp_Object internal_condition_case_1 P_ ((Lisp_Object (*) (Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
-extern Lisp_Object internal_condition_case_2 P_ ((Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
+extern Lisp_Object internal_condition_case_2 P_ ((Lisp_Object (*) (Lisp_Object, Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
+extern Lisp_Object internal_condition_case_n P_ ((Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object)));
 extern void specbind P_ ((Lisp_Object, Lisp_Object));
 extern void record_unwind_protect P_ ((Lisp_Object (*) (Lisp_Object), Lisp_Object));
 extern Lisp_Object unbind_to P_ ((int, Lisp_Object));
@@ -3018,8 +3059,9 @@ EXFUN (Ffile_readable_p, 1);
 EXFUN (Ffile_executable_p, 1);
 EXFUN (Fread_file_name, 6);
 extern Lisp_Object close_file_unwind P_ ((Lisp_Object));
+extern Lisp_Object restore_point_unwind P_ ((Lisp_Object));
 extern void report_file_error P_ ((const char *, Lisp_Object)) NO_RETURN;
-extern int internal_delete_file P_ ((Lisp_Object));
+extern int internal_delete_file P_ ((Lisp_Object, Lisp_Object));
 extern void syms_of_fileio P_ ((void));
 extern Lisp_Object make_temp_name P_ ((Lisp_Object, int));
 EXFUN (Fmake_symbolic_link, 3);
@@ -3388,6 +3430,7 @@ extern void syms_of_term P_ ((void));
 extern void fatal P_ ((const char *msgid, ...)) NO_RETURN;
 
 /* Defined in terminal.c */
+EXFUN (Fframe_terminal, 1);
 EXFUN (Fdelete_terminal, 2);
 extern void syms_of_terminal P_ ((void));
 
diff --git a/src/lread.c b/src/lread.c
index 83ebc8b3b10..a04b9679d83 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3687,7 +3687,8 @@ it defaults to the value of `obarray'.  */)
       && EQ (obarray, initial_obarray))
     {
       XSYMBOL (sym)->constant = 1;
-      XSYMBOL (sym)->value = sym;
+      XSYMBOL (sym)->redirect = SYMBOL_PLAINVAL;
+      SET_SYMBOL_VAL (XSYMBOL (sym), sym);
     }
 
   ptr = &XVECTOR (obarray)->contents[XINT (tem)];
@@ -3768,8 +3769,6 @@ OBARRAY defaults to the value of the variable `obarray'.  */)
        error ("Attempt to unintern t or nil"); */
 
   XSYMBOL (tem)->interned = SYMBOL_UNINTERNED;
-  XSYMBOL (tem)->constant = 0;
-  XSYMBOL (tem)->indirect_variable = 0;
 
   hash = oblookup_last_bucket_number;
 
@@ -3914,35 +3913,31 @@ void
 init_obarray ()
 {
   Lisp_Object oblength;
-  int hash;
-  Lisp_Object *tem;
 
   XSETFASTINT (oblength, OBARRAY_SIZE);
 
-  Qnil = Fmake_symbol (make_pure_c_string ("nil"));
   Vobarray = Fmake_vector (oblength, make_number (0));
   initial_obarray = Vobarray;
   staticpro (&initial_obarray);
-  /* Intern nil in the obarray */
-  XSYMBOL (Qnil)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY;
-  XSYMBOL (Qnil)->constant = 1;
-
-  /* These locals are to kludge around a pyramid compiler bug. */
-  hash = hash_string ("nil", 3);
-  /* Separate statement here to avoid VAXC bug. */
-  hash %= OBARRAY_SIZE;
-  tem = &XVECTOR (Vobarray)->contents[hash];
-  *tem = Qnil;
 
   Qunbound = Fmake_symbol (make_pure_c_string ("unbound"));
-  XSYMBOL (Qnil)->function = Qunbound;
-  XSYMBOL (Qunbound)->value = Qunbound;
+  /* Set temporary dummy values to Qnil and Vpurify_flag to satisfy the
+     NILP (Vpurify_flag) check in intern_c_string.  */
+  Qnil = make_number (-1); Vpurify_flag = make_number (1);
+  Qnil = intern_c_string ("nil");
+
+  /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil,
+     so those two need to be fixed manally.  */
+  SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound);
   XSYMBOL (Qunbound)->function = Qunbound;
+  XSYMBOL (Qunbound)->plist = Qnil;
+  /* XSYMBOL (Qnil)->function = Qunbound; */
+  SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil);
+  XSYMBOL (Qnil)->constant = 1;
+  XSYMBOL (Qnil)->plist = Qnil;
 
   Qt = intern_c_string ("t");
-  XSYMBOL (Qnil)->value = Qnil;
-  XSYMBOL (Qnil)->plist = Qnil;
-  XSYMBOL (Qt)->value = Qt;
+  SET_SYMBOL_VAL (XSYMBOL (Qt), Qt);
   XSYMBOL (Qt)->constant = 1;
 
   /* Qt is correct even if CANNOT_DUMP.  loadup.el will set to nil at end.  */
@@ -3981,27 +3976,29 @@ defalias (sname, string)
    to a C variable of type int.  Sample call:
    DEFVAR_INT ("emacs-priority", &emacs_priority, "Documentation");  */
 void
-defvar_int (const char *namestring, EMACS_INT *address)
+defvar_int (struct Lisp_Intfwd *i_fwd,
+            const char *namestring, EMACS_INT *address)
 {
-  Lisp_Object sym, val;
+  Lisp_Object sym;
   sym = intern_c_string (namestring);
-  val = allocate_misc ();
-  XMISCTYPE (val) = Lisp_Misc_Intfwd;
-  XINTFWD (val)->intvar = address;
-  SET_SYMBOL_VALUE (sym, val);
+  i_fwd->type = Lisp_Fwd_Int;
+  i_fwd->intvar = address;
+  XSYMBOL (sym)->redirect = SYMBOL_FORWARDED;
+  SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)i_fwd);
 }
 
 /* Similar but define a variable whose value is t if address contains 1,
    nil if address contains 0.  */
 void
-defvar_bool (const char *namestring, int *address)
+defvar_bool (struct Lisp_Boolfwd *b_fwd,
+             const char *namestring, int *address)
 {
-  Lisp_Object sym, val;
+  Lisp_Object sym;
   sym = intern_c_string (namestring);
-  val = allocate_misc ();
-  XMISCTYPE (val) = Lisp_Misc_Boolfwd;
-  XBOOLFWD (val)->boolvar = address;
-  SET_SYMBOL_VALUE (sym, val);
+  b_fwd->type = Lisp_Fwd_Bool;
+  b_fwd->boolvar = address;
+  XSYMBOL (sym)->redirect = SYMBOL_FORWARDED;
+  SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)b_fwd);
   Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars);
 }
 
@@ -4011,20 +4008,22 @@ defvar_bool (const char *namestring, int *address)
    gc-marked for some other reason, since marking the same slot twice
    can cause trouble with strings.  */
 void
-defvar_lisp_nopro (const char *namestring, Lisp_Object *address)
+defvar_lisp_nopro (struct Lisp_Objfwd *o_fwd,
+                   const char *namestring, Lisp_Object *address)
 {
-  Lisp_Object sym, val;
+  Lisp_Object sym;
   sym = intern_c_string (namestring);
-  val = allocate_misc ();
-  XMISCTYPE (val) = Lisp_Misc_Objfwd;
-  XOBJFWD (val)->objvar = address;
-  SET_SYMBOL_VALUE (sym, val);
+  o_fwd->type = Lisp_Fwd_Obj;
+  o_fwd->objvar = address;
+  XSYMBOL (sym)->redirect = SYMBOL_FORWARDED;
+  SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)o_fwd);
 }
 
 void
-defvar_lisp (const char *namestring, Lisp_Object *address)
+defvar_lisp (struct Lisp_Objfwd *o_fwd,
+             const char *namestring, Lisp_Object *address)
 {
-  defvar_lisp_nopro (namestring, address);
+  defvar_lisp_nopro (o_fwd, namestring, address);
   staticpro (address);
 }
 
@@ -4032,14 +4031,15 @@ defvar_lisp (const char *namestring, Lisp_Object *address)
    at a particular offset in the current kboard object.  */
 
 void
-defvar_kboard (const char *namestring, int offset)
+defvar_kboard (struct Lisp_Kboard_Objfwd *ko_fwd,
+               const char *namestring, int offset)
 {
-  Lisp_Object sym, val;
+  Lisp_Object sym;
   sym = intern_c_string (namestring);
-  val = allocate_misc ();
-  XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd;
-  XKBOARD_OBJFWD (val)->offset = offset;
-  SET_SYMBOL_VALUE (sym, val);
+  ko_fwd->type = Lisp_Fwd_Kboard_Obj;
+  ko_fwd->offset = offset;
+  XSYMBOL (sym)->redirect = SYMBOL_FORWARDED;
+  SET_SYMBOL_FWD (XSYMBOL (sym), (union Lisp_Fwd *)ko_fwd);
 }
 
 /* Record the value of load-path used at the start of dumping
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 065a0dd7d71..04ad9eaaf8f 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,6 +1,7 @@
 /* Machine description file for the alpha chip.
-   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
@@ -20,35 +21,16 @@ 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/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=osf1
-NOTE-END
-
-*/
-
 #ifndef _LP64
-#define _LP64                   /* This doesn't appear to be necessary
-                                   on OSF 4/5  -- fx.  */
+#define _LP64 /* This doesn't appear to be necessary on OSF 4/5  -- fx.  */
 #endif
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __alpha defined automatically */
 
 
@@ -57,15 +39,12 @@ NOTE-END
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* GNU malloc and the relocating allocator do not work together
@@ -82,16 +61,6 @@ NOTE-END
 /* #define SYSTEM_MALLOC */
 
 #ifdef __ELF__
-/* With ELF, make sure that all common symbols get allocated to in the
-   data section.  Otherwise, the dump of temacs may miss variables in
-   the shared library that have been initialized.  For example, with
-   GNU libc, __malloc_initialized would normally be resolved to the
-   shared library's .bss section, which is fatal.  */
-# ifdef __GNUC__
-#  define C_SWITCH_MACHINE      -fno-common
-# else
-#  error What gives?  Fix me if DEC Unix supports ELF now.
-# endif
 
 #undef UNEXEC
 #define UNEXEC unexelf.o
@@ -106,12 +75,10 @@ NOTE-END
 #else  /* not __ELF__ */
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START    0x120000000
 #define DATA_START    0x140000000
 
 /* The program to be used for unexec. */
-
 #define UNEXEC unexalpha.o
 
 #endif /* __ELF__ */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 4bea30d12de..1910c37bffc 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,6 +1,7 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,32 +18,13 @@ 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/>.  */
 
-#ifdef i386
-/* Although we're running on an amd64 kernel, we're actually compiling for
-   the x86 architecture.  The user should probably have provided an
-   explicit --build to `configure', but if everything else than the kernel
-   is running in i386 mode, then the bug is really ours: we should have
-   guessed better.  */
-#include "m/intel386.h"
-#else
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="linux"  */
-
 #define BITS_PER_LONG           64
 #define BITS_PER_EMACS_INT      64
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -58,77 +40,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #undef DATA_SEG_BITS
 
-#ifdef __FreeBSD__
-
-/* The libraries for binaries native to the build host's architecture are
-   installed under /usr/lib in FreeBSD, and the ones that need special paths
-   are 32-bit compatibility libraries (installed under /usr/lib32).  To build
-   a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib.  */
-
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-
-/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
-   The reason is that some functions in libgcc.a call functions from libc.a,
-   and some libc.a functions need functions from libgcc.a.  Since most
-   versions of ld are one-pass linkers, we need to mention -lgcc twice,
-   or else we risk getting unresolved externals.  */
-#undef LIB_STANDARD
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-
-#elif defined(__OpenBSD__)
-
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
-#undef LIB_STANDARD
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-
-#elif defined(__NetBSD__)
-
-/* LIB_STANDARD and START_FILES set correctly in s/netbsd.h */
-
-#elif defined(SOLARIS2)
-
-#undef START_FILES
-#undef LIB_STANDARD
-
-#elif defined(__APPLE__)
-
-/* LIB_STANDARD and START_FILES set correctly in s/darwin.h */
-
-#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !SOLARIS2
-         && !__APPLE__ */
-/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
-   The reason is that some functions in libgcc.a call functions from libc.a,
-   and some libc.a functions need functions from libgcc.a.  Since most
-   versions of ld are one-pass linkers, we need to mention -lgcc twice,
-   or else we risk getting unresolved externals.  */
-#undef START_FILES
-#undef LIB_STANDARD
-#ifdef HAVE_LIB64_DIR
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-#else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-#endif
-
-#endif /* __FreeBSD__ */
-#endif /* !i386 */
-
 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
    (do not change this comment) */
diff --git a/src/m/arm.h b/src/m/arm.h
index b04c5ecc1d9..cf30e2e1b19 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -1,6 +1,7 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,30 +18,11 @@ 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/>.  */
 
-
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  We can't
- * do this on the arm with gcc, since the first 4 args are in registers.  */
-
-#ifdef __GNUC__
-#define NO_ARG_ARRAY
-#else
-#undef NO_ARG_ARRAY
-#endif
-
 #define NO_REMAP
 
-/* armin76@gentoo.org reported that the lgcc_s flag is necessary to
-   build on ARM EABI under GNU/Linux (Bug#5518).  */
-#ifdef GNU_LINUX
-#define LIB_GCC -lgcc_s
-#endif
-
 /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
    (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index d95da6643ab..9bc361e3cc4 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -1,6 +1,7 @@
 /* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,81 +18,17 @@ 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/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
-
-/* Stuff for just HPUX.  */
-
-#if defined (__hpux)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-#endif /* __hpux */
-
 /* Systems with GCC don't need to lose. */
 #ifdef __NetBSD__
 # ifdef __GNUC__
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 188697b7e89..acf6c25844f 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,7 +1,9 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
-     Contributed by David Mosberger <davidm@hpl.hp.com>
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
+
+Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
 
@@ -23,20 +25,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-   group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 /* __ia64__ defined automatically */
 
-
 /* Define the type to use.  */
 #define EMACS_INT               long
 #define EMACS_UINT              unsigned long
@@ -46,15 +40,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE           long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #ifdef __ELF__
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index a7d35cc8ab7..3831e500641 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,7 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,39 +19,14 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="aix3-1"  */
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-
-#define IBMR2AIX
-
 /* The data segment in this machine always starts at address 0x20000000.
    An address of data cannot be stored correctly in a Lisp object;
    we always lose the high bits.  We must tell XPNTR to add them back.  */
-
 #define TEXT_START 0x10000000
 #define DATA_START 0x20000000
 #define WORDS_BIG_ENDIAN
 #define DATA_SEG_BITS 0x20000000
 
-/* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4.  */
-/* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid
-   linker error for updated X11R5 libraries, which references pthread library
-   which most machines don't have.  We use the name .inp instead of .imp
-   because .inp is a better convention to use in make-dist for naming
-   random input files.  */
-#ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
-#define LD_SWITCH_MACHINE -Wl,-bnodelcsect
-#endif /* THIS_IS_MAKEFILE */
-
 #ifndef NLIST_STRUCT
 /* AIX supposedly doesn't use this interface, but on the RS/6000
    it apparently does.  */
@@ -60,7 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))
 
-#define START_FILES
 /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
 #define BROKEN_FIONREAD
 /* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
diff --git a/src/m/ibmrs6000.inp b/src/m/ibmrs6000.inp
deleted file mode 100644
index d7f3fddaf6f..00000000000
--- a/src/m/ibmrs6000.inp
+++ /dev/null
@@ -1,4 +0,0 @@
-#!
-pthread_yield
-
-# arch-tag: fc6d01ea-c488-4862-bbdb-e8d3e0f6fdb3
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 794ab869511..1dce4ffbf47 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,34 +19,21 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -54,7 +42,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
 /* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 9429e4282bf..fda3007cb74 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,6 +1,7 @@
 /* machine description file for IBM S390 in 64-bit mode
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,31 +21,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This file was made by copying the significant parts of amdx86-64.h
    into ibms390.h.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"
-
-NOTE-START
-IBM s390 64 bits (-machine=ibms390x64)
-
-  The possibilities for -opsystem are: gnu-linux.
-
-NOTE-END */
-
+/* Used for machine IBM s390 64 bits with opsys gnu-linux.  */
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Define the type to use.  */
 #define EMACS_INT long
 #define EMACS_UINT unsigned long
@@ -54,15 +38,12 @@ NOTE-END */
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #undef EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -71,38 +52,20 @@ NOTE-END */
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
 /* Define HAVE_ALLOCA to say that the system provides a properly
    working alloca function and it should be used.  Undefine it if an
    assembler-language alloca in the file alloca.s should be used. */
-
 #define HAVE_ALLOCA
 
 /* On the 64 bit architecture, we can use 60 bits for addresses */
-
 #define VALBITS         60
 
 #define LINKER $(CC) -nostdlib
 
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-
 #define XPNTR(a) XUINT (a)
 
-#undef START_FILES
-#ifdef HAVE_LIB64_DIR
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-#else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-#endif
-
-#undef LIB_STANDARD
-#ifdef HAVE_LIB64_DIR
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-#else
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-#endif
-
 /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
    (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index dc50d5ea6a2..984a9959736 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,7 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,69 +19,10 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-Intel 386 (-machine=intel386)
-
-  The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
-  isc2-2, 386-ix, and linux.
-
-  18.58 should support a wide variety of operating systems.
-  Use linux for Linux.
-  It isn't clear what to do on an SCO system.
-
-NOTE-END */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-/* #define NO_ARG_ARRAY */
-
-/* crt0.c, if it is used, should use the i386-bsd style of entry.
-   with no extra dummy args.  On USG and XENIX,
-   NO_REMAP says this isn't used. */
-
-#define CRT0_DUMMIES bogus_fp,
-
-#ifdef SOLARIS2
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-/* This is totally uncalibrated. */
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
-
-/* J.W.Hawtin@lut.ac.uk say Solaris 2.4 as well as Solaris 2.1 on X86
-   requires -lkvm as well.
-   And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5.  */
-#define LIBS_MACHINE -lkvm -lelf
-
-/* configure thinks solaris X86 has gethostname, but it does not work,
-   so undefine it.  */
-#undef HAVE_GETHOSTNAME
-
-#else /* not SOLARIS2 */
-#ifdef USG5_4 /* Older USG systems do not support the load average.  */
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-/* This is totally uncalibrated. */
-
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
-#define FSCALE 256.0
-#endif /* USG5_4 */
-#endif /* not SOLARIS2 */
-
 #ifdef USG
 #define TEXT_START 0
 #endif /* USG */
@@ -88,7 +30,6 @@ NOTE-END */
 #ifdef WINDOWSNT
 #define VIRT_ADDR_VARIES
 #define DATA_START      get_data_start ()
-#define NO_ARG_ARRAY
 #endif
 
 #ifdef GNU_LINUX
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 1c276ecb167..e7f332057e5 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,7 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,49 +21,29 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #define TEXT_START 0x400000
 
-/*
- * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
- * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
- * the value field of a LISP_OBJECT).
- */
-
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+   the value field of a LISP_OBJECT).  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS   0x10000000
 
-/* Use terminfo instead of termcap.  */
-
-#define TERMINFO
-
-/* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
 
 #if _MIPS_SZLONG != 64
 /* fixme: should there be 64-bit definitions?  (The ones below aren't OK.)  */
 
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
-
 #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
 
 #define XSET(var, type, ptr) \
diff --git a/src/m/m68k.h b/src/m/m68k.h
index b844f12fd6f..668db282593 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,6 +1,7 @@
 /* Machine description file for generic Motorola 68k.
-   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,12 +20,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
-
 #ifndef m68k
 #define m68k
 #endif
@@ -34,7 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 #ifdef GNU_LINUX
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 150fc356518..b9dcf3bdc92 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,7 @@
 /* machine description file For the powerpc Macintosh.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,20 +20,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
@@ -41,19 +34,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
    For MkLinux/LinuxPPC.  */
-
 #ifdef GNU_LINUX
 #define LINKER $(CC) -nostdlib
-/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
-   because prefix-args is not used.  */
-#undef LD_SWITCH_SYSTEM_TEMACS
-#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
-#ifdef _ARCH_PPC64
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-#undef LIB_STANDARD
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-#endif
 #endif
 
 #ifdef _ARCH_PPC64
diff --git a/src/m/mips.h b/src/m/mips.h
index 7a84b6596c8..8e81c077426 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,6 +1,7 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,57 +18,21 @@ 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/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-This is used on GNU/Linux and netbsd.
-NOTE-END  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL))
 #define WORDS_BIG_ENDIAN
 #endif
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Describe layout of the address space in an executing process.  */
-
 #define TEXT_START      0x00400000
 
-
-#if 0 /* These definitions were advantageous when not using
-         USE_LSB_TAG.  With that, they get ignored but cause errors.  */
-
-#define DATA_SEG_BITS   0x10000000
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short.  */
-
-#define XUINT(a) (((unsigned)(a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
-
-#define XSET(var, type, ptr)                                            \
-  ((var) =                                                              \
-   ((int)(type) << VALBITS)                                             \
-   + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
-
 /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
    (do not change this comment) */
-
-#endif /* 0 */
-
diff --git a/src/m/sh3.h b/src/m/sh3.h
index bb8e2937b01..703513d23f7 100644
--- a/src/m/sh3.h
+++ b/src/m/sh3.h
@@ -4,7 +4,5 @@
 # define WORDS_BIG_ENDIAN
 #endif
 
-#define NO_ARG_ARRAY
-
 /* arch-tag: 1b01b84f-f044-4afa-aa4b-caa54ec38966
    (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 3eeb87a2b0e..39240dcbf5c 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,7 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,64 +18,34 @@ 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/>.  */
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=sunos4 for operating system version 4, and
--opsystem=bsd4-2 for earlier versions.
-NOTE-END  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* __sparc__ is defined by the compiler by default.  */
 
 /* XINT must explicitly sign-extend
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Mask for address bits within a memory segment */
-
 #define SEGMENT_MASK (SEGSIZ - 1)
 
 #ifdef __arch64__               /* GCC, 64-bit ABI.  */
+
 #define BITS_PER_LONG 64
-#ifdef __linux__
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-
-/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
-   The reason is that some functions in libgcc.a call functions from libc.a,
-   and some libc.a functions need functions from libgcc.a.  Since most
-   versions of ld are one-pass linkers, we need to mention -lgcc twice,
-   or else we risk getting unresolved externals.  */
-#undef LIB_STANDARD
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-#endif
 
 #ifndef _LP64
-#define _LP64                   /* Done on Alpha -- not sure if it
-                                   should be here.  -- fx */
-#endif
+#define _LP64 /* Done on Alpha -- not sure if it should be here.  -- fx */
 #endif
 
+#endif  /* __arch64__ */
+
 /* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
    (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index 6e0dbb79844..9b8d2d63055 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,6 +1,7 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,21 +18,10 @@ 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/>.  */
 
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.
    Ones defined so far include m68k and many others */
@@ -41,21 +31,17 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    are always unsigned.
 
    This flag only matters if you use USE_LISP_UNION_TYPE.  */
-
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE long
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
    and temacs will do (load "loadup") automatically unless told otherwise.  */
-
 #define CANNOT_DUMP
 
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
@@ -64,31 +50,25 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
-
 #define VIRT_ADDR_VARIES
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp
    code will not be sharable; but that's better than failing completely.  */
-
 #define NO_REMAP
 
 /* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
-
+   do not support asynchronous I/O (using SIGIO) on sockets,
+   even though it works fine on tty's.  If you have one of
+   these systems, define the following, and then use it in
+   config.h (or elsewhere) to decide when (not) to use SIGIO.
+
+   You'd think this would go in an operating-system description file,
+   but since it only occurs on some, but not all, BSD systems, the
+   reasonable place to select for it is in the machine description file.  */
 #define NO_SOCK_SIGIO
 
-
 /* After adding support for a new system, modify the large case
    statement in the `configure' script to recognize reasonable
    configuration names, and add a description of the system to
diff --git a/src/m/vax.h b/src/m/vax.h
index f33c2d5227a..3426a20d55e 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,6 +1,7 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,18 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="note"
-
-NOTE-START
-The vax (-machine=vax) runs zillions of different operating systems.
-
-NOTE-END  */
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
-
 #undef WORDS_BIG_ENDIAN
 
 /* #define vax    -- appears to be done automatically  */
@@ -38,11 +29,9 @@ NOTE-END  */
    support the load average, so disable it for them.  */
 
 /* Data type of load average, as read out of kmem.  */
-
 #define LOAD_AVE_TYPE double
 
 /* Convert that into an integer that is 100 for a load average of 1.0  */
-
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
 
 #define HAVE_FTIME
diff --git a/src/m/xtensa.h b/src/m/xtensa.h
index d53686d9401..664f18dcb10 100644
--- a/src/m/xtensa.h
+++ b/src/m/xtensa.h
@@ -2,8 +2,6 @@
 
 Add a license notice if this grows to > 10 lines of code.  */
 
-#define NO_ARG_ARRAY
-
 #ifdef __LITTLE_ENDIAN
 #undef WORDS_BIG_ENDIAN
 #else
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 5eaba6374fd..34af372dc5e 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -62,7 +62,6 @@ OBJ1 =  $(BLD)/alloc.$(O)		\
         $(BLD)/callint.$(O)             \
         $(BLD)/callproc.$(O)            \
         $(BLD)/casefiddle.$(O)          \
-        $(BLD)/cm.$(O)                  \
         $(BLD)/cmds.$(O)                \
         $(BLD)/data.$(O)                \
         $(BLD)/dired.$(O)               \
@@ -98,7 +97,6 @@ OBJ1 =  $(BLD)/alloc.$(O)		\
         $(BLD)/syntax.$(O)              \
         $(BLD)/sysdep.$(O)              \
         $(BLD)/term.$(O)                \
-        $(BLD)/termcap.$(O)             \
         $(BLD)/tparam.$(O)              \
         $(BLD)/undo.$(O)                \
         $(BLD)/unexw32.$(O)             \
@@ -494,17 +492,6 @@ $(BLD)/chartab.$(O) : \
         $(SRC)/character.h \
         $(SRC)/charset.h
 
-$(BLD)/cm.$(O) : \
-        $(SRC)/cm.c \
-        $(CONFIG_H) \
-        $(SRC)/lisp.h \
-        $(SRC)/cm.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/frame.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/w32gui.h
-
 $(BLD)/cmds.$(O) : \
         $(SRC)/cmds.c \
         $(CONFIG_H) \
@@ -710,6 +697,7 @@ $(BLD)/eval.$(O) : \
         $(SRC)/commands.h \
         $(SRC)/composite.h \
         $(SRC)/dispextern.h \
+        $(SRC)/frame.h \
         $(SRC)/keyboard.h \
         $(SRC)/systime.h \
         $(SRC)/w32gui.h
@@ -1407,13 +1395,6 @@ $(BLD)/term.$(O) : \
         $(SRC)/w32gui.h \
         $(SRC)/window.h
 
-$(BLD)/termcap.$(O) : \
-        $(SRC)/termcap.c \
-        $(CONFIG_H) \
-        $(EMACS_ROOT)/nt/inc/unistd.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(SRC)/lisp.h
-
 $(BLD)/terminal.$(O) : \
         $(SRC)/terminal.c \
         $(CONFIG_H) \
@@ -1574,6 +1555,7 @@ $(BLD)/w32fns.$(O) : \
         $(SRC)/keyboard.h \
         $(SRC)/systime.h \
         $(SRC)/termhooks.h \
+        $(SRC)/w32.h \
         $(SRC)/w32font.h \
         $(SRC)/w32gui.h \
         $(SRC)/w32heap.h \
diff --git a/src/msdos.c b/src/msdos.c
index 6cde7cd6ebc..ea604d29992 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -528,8 +528,7 @@ dos_set_window_size (rows, cols)
   /* If the user specified a special video mode for these dimensions,
      use that mode.  */
   sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols);
-  video_mode = XSYMBOL (Fintern_soft (build_string (video_name),
-                                      Qnil))-> value;
+  video_mode = Fsymbol_value (Fintern_soft (build_string (video_name), Qnil));
 
   if (INTEGERP (video_mode)
       && (video_mode_value = XINT (video_mode)) > 0)
@@ -4458,8 +4457,6 @@ setpriority (x,y,z) int x,y,z; { return 0; }
 
 #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2
 
-#ifdef POSIX_SIGNALS
-
 /* Augment DJGPP library POSIX signal functions.  This is needed
    as of DJGPP v2.01, but might be in the library in later releases. */
 
@@ -4557,12 +4554,6 @@ sigprocmask (how, new_set, old_set)
   return 0;
 }
 
-#else /* not POSIX_SIGNALS */
-
-sigsetmask (x) int x; { return 0; }
-sigblock (mask) int mask; { return 0; }
-
-#endif /* not POSIX_SIGNALS */
 #endif /* not __DJGPP_MINOR__ < 2 */
 
 #ifndef HAVE_SELECT
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2581be9aeb7..f85ebc165af 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1709,7 +1709,7 @@ void process_dialog (id window, Lisp_Object list)
 
 - (Lisp_Object)runDialogAt: (NSPoint)p
 {
-  int ret;
+  NSInteger ret;
   extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */
 
   /* initiate a session that will be ended by pop_down_menu */
diff --git a/src/print.c b/src/print.c
index ccbf8d8c0c7..6d403e00fe0 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2267,70 +2267,6 @@ print_object (obj, printcharfun, escapeflag)
           strout ("#<misc free cell>", -1, -1, printcharfun, 0);
           break;
 
-        case Lisp_Misc_Intfwd:
-          sprintf (buf, "#<intfwd to %ld>", (long) *XINTFWD (obj)->intvar);
-          strout (buf, -1, -1, printcharfun, 0);
-          break;
-
-        case Lisp_Misc_Boolfwd:
-          sprintf (buf, "#<boolfwd to %s>",
-                   (*XBOOLFWD (obj)->boolvar ? "t" : "nil"));
-          strout (buf, -1, -1, printcharfun, 0);
-          break;
-
-        case Lisp_Misc_Objfwd:
-          strout ("#<objfwd to ", -1, -1, printcharfun, 0);
-          print_object (*XOBJFWD (obj)->objvar, printcharfun, escapeflag);
-          PRINTCHAR ('>');
-          break;
-
-        case Lisp_Misc_Buffer_Objfwd:
-          strout ("#<buffer_objfwd to ", -1, -1, printcharfun, 0);
-          print_object (PER_BUFFER_VALUE (current_buffer,
-                                          XBUFFER_OBJFWD (obj)->offset),
-                        printcharfun, escapeflag);
-          PRINTCHAR ('>');
-          break;
-
-        case Lisp_Misc_Kboard_Objfwd:
-          strout ("#<kboard_objfwd to ", -1, -1, printcharfun, 0);
-          print_object (*(Lisp_Object *) ((char *) current_kboard
-                                          + XKBOARD_OBJFWD (obj)->offset),
-                        printcharfun, escapeflag);
-          PRINTCHAR ('>');
-          break;
-
-        case Lisp_Misc_Buffer_Local_Value:
-          strout ("#<buffer_local_value ", -1, -1, printcharfun, 0);
-          if (XBUFFER_LOCAL_VALUE (obj)->local_if_set)
-            strout ("[local-if-set] ", -1, -1, printcharfun, 0);
-          strout ("[realvalue] ", -1, -1, printcharfun, 0);
-          print_object (XBUFFER_LOCAL_VALUE (obj)->realvalue,
-                        printcharfun, escapeflag);
-          if (XBUFFER_LOCAL_VALUE (obj)->found_for_buffer)
-            strout ("[local in buffer] ", -1, -1, printcharfun, 0);
-          else
-            strout ("[buffer] ", -1, -1, printcharfun, 0);
-          print_object (XBUFFER_LOCAL_VALUE (obj)->buffer,
-                        printcharfun, escapeflag);
-          if (XBUFFER_LOCAL_VALUE (obj)->check_frame)
-            {
-              if (XBUFFER_LOCAL_VALUE (obj)->found_for_frame)
-                strout ("[local in frame] ", -1, -1, printcharfun, 0);
-              else
-                strout ("[frame] ", -1, -1, printcharfun, 0);
-              print_object (XBUFFER_LOCAL_VALUE (obj)->frame,
-                            printcharfun, escapeflag);
-            }
-          strout ("[alist-elt] ", -1, -1, printcharfun, 0);
-          print_object (XCAR (XBUFFER_LOCAL_VALUE (obj)->cdr),
-                        printcharfun, escapeflag);
-          strout ("[default-value] ", -1, -1, printcharfun, 0);
-          print_object (XCDR (XBUFFER_LOCAL_VALUE (obj)->cdr),
-                        printcharfun, escapeflag);
-          PRINTCHAR ('>');
-          break;
-
         case Lisp_Misc_Save_Value:
           strout ("#<save_value ", -1, -1, printcharfun, 0);
           sprintf(buf, "ptr=0x%08lx int=%d",
diff --git a/src/process.c b/src/process.c
index 7e8f4cc57bc..a09ac297a2d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1866,7 +1866,6 @@ create_process (process, new_argv, current_dir)
 #if !defined (WINDOWSNT) && defined (FD_CLOEXEC)
   int wait_child_setup[2];
 #endif
-#ifdef POSIX_SIGNALS
   sigset_t procmask;
   sigset_t blocked;
   struct sigaction sigint_action;
@@ -1874,7 +1873,6 @@ create_process (process, new_argv, current_dir)
 #ifdef AIX
   struct sigaction sighup_action;
 #endif
-#endif /* POSIX_SIGNALS */
   /* Use volatile to protect variables from being clobbered by longjmp.  */
   volatile int forkin, forkout;
   volatile int pty_flag = 0;
@@ -1979,7 +1977,6 @@ create_process (process, new_argv, current_dir)
 
   /* Delay interrupts until we have a chance to store
      the new fork's pid in its process structure */
-#ifdef POSIX_SIGNALS
   sigemptyset (&blocked);
 #ifdef SIGCHLD
   sigaddset (&blocked, SIGCHLD);
@@ -1996,13 +1993,6 @@ create_process (process, new_argv, current_dir)
 #endif
 #endif /* HAVE_WORKING_VFORK */
   sigprocmask (SIG_BLOCK, &blocked, &procmask);
-#else /* !POSIX_SIGNALS */
-#ifdef SIGCHLD
-#if defined (BSD_SYSTEM)
-  sigsetmask (sigmask (SIGCHLD));
-#endif /* BSD_SYSTEM */
-#endif /* SIGCHLD */
-#endif /* !POSIX_SIGNALS */
 
   FD_SET (inchannel, &input_wait_mask);
   FD_SET (inchannel, &non_keyboard_wait_mask);
@@ -2153,15 +2143,7 @@ create_process (process, new_argv, current_dir)
         signal (SIGQUIT, SIG_DFL);
 
         /* Stop blocking signals in the child.  */
-#ifdef POSIX_SIGNALS
         sigprocmask (SIG_SETMASK, &procmask, 0);
-#else /* !POSIX_SIGNALS */
-#ifdef SIGCHLD
-#if defined (BSD_SYSTEM)
-        sigsetmask (SIGEMPTYMASK);
-#endif /* BSD_SYSTEM */
-#endif /* SIGCHLD */
-#endif /* !POSIX_SIGNALS */
 
         if (pty_flag)
           child_setup_tty (xforkout);
@@ -2243,7 +2225,6 @@ create_process (process, new_argv, current_dir)
 
   /* Restore the signal state whether vfork succeeded or not.
      (We will signal an error, below, if it failed.)  */
-#ifdef POSIX_SIGNALS
 #ifdef HAVE_WORKING_VFORK
   /* Restore the parent's signal handlers.  */
   sigaction (SIGINT, &sigint_action, 0);
@@ -2254,13 +2235,6 @@ create_process (process, new_argv, current_dir)
 #endif /* HAVE_WORKING_VFORK */
   /* Stop blocking signals in the parent.  */
   sigprocmask (SIG_SETMASK, &procmask, 0);
-#else /* !POSIX_SIGNALS */
-#ifdef SIGCHLD
-#if defined (BSD_SYSTEM)
-  sigsetmask (SIGEMPTYMASK);
-#endif /* BSD_SYSTEM */
-#endif /* SIGCHLD */
-#endif /* !POSIX_SIGNALS */
 
   /* Now generate the error if vfork failed.  */
   if (pid < 0)
@@ -5396,7 +5370,7 @@ read_process_output (proc, channel)
   /* There's no good reason to let process filters change the current
      buffer, and many callers of accept-process-output, sit-for, and
      friends don't expect current-buffer to be changed from under them.  */
-  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+  record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
 
   /* Read and dispose of the process output.  */
   outstream = p->filter;
@@ -6814,7 +6788,7 @@ exec_sentinel (proc, reason)
   /* There's no good reason to let sentinels change the current
      buffer, and many callers of accept-process-output, sit-for, and
      friends don't expect current-buffer to be changed from under them.  */
-  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+  record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
 
   sentinel = p->sentinel;
   if (NILP (sentinel))
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 32bc67bfd46..cdb97b7f9fa 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,6 @@
 /*
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,68 +17,48 @@ 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/>.  */
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG                             /* System III, System V, etc */
 #define USG5
 
-/*      This symbol should be defined on AIX Version 3  ??????? */
+/* This symbol should be defined on AIX Version 3  ??????? */
 #ifndef _AIX
 #define _AIX
 #endif
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
-
 #define SYSTEM_TYPE "aix"
 
 /* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
    To get the name of the slave side, you just ttyname() the master side.  */
-
 #define PTY_ITERATION for (c = 0; !c ; c++)
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
 #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
 
-/*
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIOS
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-
 #define HAVE_SOCKETS
 
 
-/*
- *      Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- *      library functions.  Almost, but not quite the same as
- *      the 4.2 functions
- */
-
+/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
+   functions.  Almost, but not quite the same as the 4.2 functions.  */
 #define SYSV_SYSTEM_DIR
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* The file containing the kernel's symbol table is called /unix.  */
-
 #define KERNEL_FILE "/unix"
 
-/* The symbol in the kernel where the load average is found
-   is named avenrun.  */
-
+/* The kernel symbol where the load average is found is named avenrun.  */
 #define LDAV_SYMBOL "avenrun"
 
 /* Special itemss needed to make Emacs run on this system.  */
@@ -87,40 +67,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define LINKER cc
 #endif
 
-/* No need to specify -lc when linking.  */
-
-#define LIB_STANDARD
-
-/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
-   on older versions of X where it happens to exist.  */
-#ifdef HAVE_LIBPTHREADS
-#define LIBS_SYSTEM -lrts -lIM -liconv -lpthreads
-#else
-/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
-#define LIBS_SYSTEM -lrts -lIM -liconv
-#endif
-
-/* Use terminfo instead of termcap.  */
-
-#define TERMINFO
-
 /* The following definition seems to be needed in AIX version 3.1.6.8.
    It may not have been needed in certain earlier versions.  */
 #define HAVE_TCATTR
 
-/* Include unistd.h, even though we don't define POSIX.  */
-#define NEED_UNISTD_H
-
 /* AIX doesn't define this.  */
 #define unix 1
 
-#ifndef __GNUC__
-/* Some programs in src produce warnings saying certain subprograms
-   are to comples and need a MAXMEM value greater than 2000 for
-   additional optimization.  --nils@exp-math.uni-essen.de */
-#define C_SWITCH_SYSTEM -ma -qmaxmem=4000
-#endif
-
 /* string.h defines rindex as a macro, at least with native cc, so we
    lose declaring char * rindex without this.
    It is just a guess which versions of AIX need this definition.  */
@@ -128,19 +81,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
 #define SIGNALS_VIA_CHARACTERS
-#define MAIL_USE_LOCKF
 #define CLASH_DETECTION
 
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
-#define POSIX_SIGNALS
 #undef sigmask
 
-/* olson@mcs.anl.gov says -li18n is needed by -lXm.  */
-#define LIB_MOTIF -lXm -li18n
-
 #ifndef HAVE_LIBXMU
-#define LIBXMU
-
 /* Unfortunately without libXmu we cannot support EditRes.  */
 #define NO_EDITRES
 #endif
@@ -148,7 +94,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* On AIX Emacs uses the gmalloc.c malloc implementation.  But given
    the way this system works, libc functions that return malloced
    memory use the libc malloc implementation. Calling xfree or
-   xrealloc on the results of such functions results in a crash. 
+   xrealloc on the results of such functions results in a crash.
 
    One solution for this could be to define SYSTEM_MALLOC here, but
    that does not currently work on this system.
@@ -156,11 +102,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It is possible to completely override the malloc implementation on
    AIX, but that involves putting the malloc functions in a shared
    library and setting the MALLOCTYPE environment variable to point to
-   tha shared library.
-   
+   that shared library.
+
    Emacs currently calls xrealloc on the results of get_current_dir name,
-   to avoid a crash just use the Emacs implementation for that function.
-*/
+   to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
 
 #define UNEXEC unexaix.o
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 9dad7a9b1d9..2a8934d7f50 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,10 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.   */
 
 /* We give these symbols the numeric values found in <sys/param.h> to
    avoid warnings about redefined macros.  */
@@ -48,9 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SYSV_SYSTEM_DIR
 
-/* POSIX-style pgrp behavior.  */
-#undef BSD_PGRPS
-
 #define UNEXEC unexelf.o
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
@@ -58,61 +54,40 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    generated in the Makefile generated by `xmkmf'.  If we don't
    define NARROWPROTO, we will see the wrong function prototypes
    for X functions taking float or double parameters.  */
-
 #define NARROWPROTO 1
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
-
 #define SYSTEM_TYPE "berkeley-unix"
 
 /* Do not use interrupt_input = 1 by default, because in 4.3
    we can make noninterrupt input work properly.  */
-
 #undef INTERRUPT_INPUT
 
 /* First pty name is /dev/ptyp0.  */
-
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-
 #define HAVE_SOCKETS
 
 /* Define this symbol if your system has the functions bcopy, etc. */
-
 #define BSTRING
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-#define MAIL_USE_FLOCK
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* The file containing the kernel's symbol table is called /vmunix.  */
-
 #define KERNEL_FILE "/vmunix"
 
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  */
-
+/* The kernel symbol where the load average is found is named _avenrun.  */
 #define LDAV_SYMBOL "_avenrun"
 
 /* Send signals to subprocesses by "typing" special chars at them.  */
-
 #define SIGNALS_VIA_CHARACTERS
 
 /* arch-tag: 0c367245-bde3-492e-9029-3ff6898beb95
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9ca5c67ce37..e2afb7ddc44 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,6 +1,7 @@
 /* System description header file for Cygwin.
-   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
-
 #define SYSTEM_TYPE "cygwin"
 
 /* Emacs can read input using SIGIO and buffering characters itself,
@@ -43,26 +43,19 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
    through a pipe. */
-
 #undef INTERRUPT_INPUT
 
-/*
- *      Define HAVE_TERMIOS if the system provides POSIX-style
- *      functions and macros for terminal control.
- *
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- *
- *      Do not define both.  HAVE_TERMIOS is preferred, if it is
- *      supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
 
-#define HAVE_TERMIOS
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
+   Do not define both.  HAVE_TERMIOS is preferred, if it is
+   supported on your system.  */
+#define HAVE_TERMIOS
 
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define PTY_ITERATION           for (i = 0; i < 1; i++) /* ick */
 #define PTY_NAME_SPRINTF        /* none */
@@ -81,13 +74,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   while (0)
 
 /* Define this symbol if your system has the functions bcopy, etc. */
-
 #define BSTRING
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
@@ -95,22 +86,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    generated in the Makefile generated by `xmkmf'.  If we don't
    define NARROWPROTO, we will see the wrong function prototypes
    for X functions taking float or double parameters.  */
-
 #define NARROWPROTO 1
 
-/* used in various places to enable cygwin-specific code changes */
+/* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define SYSV_SYSTEM_DIR 1
 #define UNEXEC unexcw.o
-#define POSIX_SIGNALS 1
 #define LINKER $(CC)
 
-/* Use terminfo instead of termcap.  Fewer environment variables to
-   go wrong, more terminal types. */
-#define TERMINFO
-
 #define HAVE_SOCKETS
 
 /* vfork() interacts badly with setsid(), causing ptys to fail to
@@ -132,7 +117,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
-/* the end */
-
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
    (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index e8081c6dd25..76c0054cd3f 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,7 @@
 /* System description header file for Darwin (Mac OS X).
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,11 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define BSD4_2
 /* BSD4_3 and BSD4_4 are already defined in sys/param.h */
 #define BSD_SYSTEM
@@ -30,14 +28,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* More specific than the above two.  We cannot use __APPLE__ as this
    may not be defined on non-OSX Darwin, and we cannot define DARWIN
    here because Panther and lower CoreFoundation.h uses DARWIN to
-   distinguish OS X from pure Darwin. */
-
+   distinguish OS X from pure Darwin.  */
 #define DARWIN_OS
 
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "darwin"
 
 /* Emacs can read input using SIGIO and buffering characters itself,
@@ -61,58 +57,54 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
    through a pipe. */
-
 #define INTERRUPT_INPUT
 
 /* Letter to use in finding device name of first pty,
   if system supports pty's.  'a' means it is /dev/ptya0  */
-
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *      Define HAVE_TERMIOS if the system provides POSIX-style
- *      functions and macros for terminal control.
- *
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- *
- *      Do not define both.  HAVE_TERMIOS is preferred, if it is
- *      supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
 
-#define HAVE_TERMIOS
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
 
+   Do not define both.  HAVE_TERMIOS is preferred, if it is supported
+   on your system. */
+#define HAVE_TERMIOS
 #define NO_TERMIO
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- *      Note: PTYs are broken on darwin <6.  Use at your own risk.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.
+   Note: PTYs are broken on darwin <6.  Use at your own risk.  */
 #define HAVE_PTYS
-
-/**
- * PTYs only work correctly on Darwin 7 or higher.  So make the
- * default for process-connection-type dependent on the kernel
- * version.
- */
+/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
+#define PTY_ITERATION   for (i = 0; i < 1; i++)
+#define PTY_NAME_SPRINTF        /* none */
+#define PTY_TTY_NAME_SPRINTF    /* none */
+/* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8.
+   But we don't have to block SIGCHLD because it is blocked in the
+   implementation of grantpt.  */
+#define PTY_OPEN                                                \
+  do                                                            \
+    {                                                           \
+      int slave;                                                \
+      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)    \
+        fd = -1;                                                \
+      else                                                      \
+        emacs_close (slave);                                    \
+    }                                                           \
+  while (0)
+
+/* PTYs only work correctly on Darwin 7 or higher.  So make the default
+   for process-connection-type dependent on the kernel version.  */
 #define MIN_PTY_KERNEL_VERSION '7'
 
 /* Define this symbol if your system has the functions bcopy, etc. */
-
 #define BSTRING
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-#define MAIL_USE_FLOCK
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* Avoid the use of the name init_process (process.c) because it is
@@ -122,74 +114,42 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Used in dispnew.c.  Copied from freebsd.h. */
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-/* System uses OXTABS instead of the expected TAB3.  (Copied from
-   bsd386.h.)  */
+/* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
 #define TAB3 OXTABS
 
-/* Darwin ld insists on the use of malloc routines in the System
-   framework.  */
+/* Darwin ld insists on the use of malloc routines in the System framework.  */
 #define SYSTEM_MALLOC
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
 /* Definitions for how to dump.  Copied from nextstep.h.  */
-
 #define UNEXEC unexmacosx.o
 
-#define START_FILES pre-crt0.o
-
 /* start_of_text isn't actually used, so make it compile without error.  */
 #define TEXT_START (0)
 
 /* Definitions for how to compile & link.  */
-
 #ifdef HAVE_NS
-#define LIBS_NSGUI -framework AppKit
 #define SYSTEM_PURESIZE_EXTRA 200000
-#define HEADERPAD_EXTRA 6C8
-#else /* !HAVE_NS */
-#define LIBS_NSGUI
-#define HEADERPAD_EXTRA 690
-#endif /* !HAVE_NS */
+#endif
 
 /* On Darwin, res_init appears not to be useful: see bug#562 and
    http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html  */
-
 #undef HAVE_RES_INIT
 #undef HAVE_LIBRESOLV
 
-/* The -headerpad option tells ld (see man page) to leave room at the
-   end of the header for adding load commands.  Needed for dumping.
-   0x690 is the total size of 30 segment load commands (at 56
-   each); under Cocoa 31 commands are required.  */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
-
 #ifdef emacs
 #define malloc unexec_malloc
 #define realloc unexec_realloc
 #define free unexec_free
-/* Don't use posix_memalign because it is not compatible with
-   unexmacosx.c.  */
+/* Don't use posix_memalign because it is not compatible with unexmacosx.c.  */
 #undef HAVE_POSIX_MEMALIGN
 #endif
 
-/* The ncurses library has been moved out of the System framework in
-   Mac OS X 10.2.  So if ./configure detects it, set the command-line
-   option to use it.  */
-#ifdef HAVE_LIBNCURSES
-#define LIBS_TERMCAP -lncurses
-/* This prevents crashes when running Emacs in Terminal.app under
-   10.2.  */
-#define TERMINFO
-#endif
-
 /* Link this program just by running cc.  */
 #define ORDINARY_LINK
 
-/* Adding -lm confuses the dynamic linker, so omit it.  */
-#define LIB_MATH
-
 /* Define the following so emacs symbols will not conflict with those
    in the System framework.  Otherwise -prebind will not work.  */
 
@@ -211,12 +171,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
 
-/* This makes create_process in process.c save and restore signal
-   handlers correctly.  Suggested by Nozomu Ando.*/
-#define POSIX_SIGNALS
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-   stack.  */
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
 /* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index a84627d3268..2b53ec0413f 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -1,9 +1,8 @@
 /* System description header for FreeBSD systems.
-   This file describes the parameters that system description files
-   should define or not.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 Author: Shawn M. Carey
 (according to authors.el)
@@ -31,28 +30,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#define LIBS_SYSTEM -lutil
-#if __FreeBSD_version < 400000
-#define LIBS_TERMCAP -ltermcap
-#else
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-#endif
-
-/* Let `ld' find image libs and similar things in /usr/local/lib.  The
-   system compiler, GCC, has apparently been modified to not look
-   there, contrary to what a stock GCC would do.  */
-
-#define LD_SWITCH_SYSTEM  -L/usr/local/lib
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#undef LIB_GCC
-#define LIB_GCC
-
 #define HAVE_GETLOADAVG 1
 #define DECLARE_GETPWUID_WITH_UID_T
 
-/* this silences a few compilation warnings */
+/* This silences a few compilation warnings.  */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1
 #define BSD_SYSTEM 199103
@@ -67,13 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
 
-/* The following is needed to make `configure' find Xpm, Xaw3d and
-   image include and library files if using /usr/bin/gcc.  That
-   compiler seems to be modified to not find headers in
-   /usr/local/include or libs in /usr/local/lib by default.  */
-
-#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib
-
 /* Circumvent a bug in FreeBSD.  In the following sequence of
    writes/reads on a PTY, read(2) returns bogus data:
 
@@ -87,37 +61,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    successfully after processing (for example with CRs added if the
    terminal is set up that way which it is here).  The same bytes will
    be seen again in a later read(2), without the CRs.  */
-
 #define BROKEN_PTY_READ_AFTER_EAGAIN 1
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-   stack.  */
-
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
 /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
    buffer text.  This overrides REL_ALLOC.  */
-
 #define USE_MMAP_FOR_BUFFERS    1
 
-/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
-   of sigblock says it is obsolete.  */
-
-#define POSIX_SIGNALS           1
-
-/* The `combreloc' setting became the default, and it seems to be
-   incompatible with unexec.  Symptom is an immediate SEGV in
-   XtInitializeWidget when starting Emacs under X11.  */
-
-#if defined __FreeBSD_version && __FreeBSD_version >= 500042
-#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-#endif
-
 /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
    (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index b9139435f61..3aa2dc16f42 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,9 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+This file was put together by Michael K. Johnson and Rik Faith.
 
 This file is part of GNU Emacs.
 
@@ -17,20 +20,13 @@ 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/>.  */
 
-/* This file was put together by Michael K. Johnson and Rik Faith.  */
-
-
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG
 #define GNU_LINUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "gnu/linux"         /* All the best software is free. */
 
 #ifndef NOT_C_CODE
@@ -49,9 +45,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
 
-/* Run only once.  We need a `for'-loop because the code uses
-   `continue'.  */
-
+/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
 #define PTY_ITERATION   for (i = 0; i < 1; i++)
 
 #ifdef HAVE_GETPT
@@ -63,7 +57,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Note that grantpt and unlockpt may fork.  We must block SIGCHLD to
    prevent sigchld_handler from intercepting the child's death.  */
-
 #define PTY_TTY_NAME_SPRINTF                            \
   {                                                     \
     char *ptyname;                                      \
@@ -85,58 +78,29 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Letter to use in finding device name of first pty,
    if system supports pty's.  'p' means it is /dev/ptyp0  */
-
 #define FIRST_PTY_LETTER 'p'
 
 #endif  /* not HAVE_GRANTPT */
 
 /*  Define HAVE_TERMIOS if the system provides POSIX-style
     functions and macros for terminal control.  */
-
 #define HAVE_TERMIOS
 
-/* Define HAVE_PTYS if the system supports pty devices. */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 #define HAVE_SOCKETS
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* This is used in list_system_processes.  */
 #define HAVE_PROCFS 1
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-/* On GNU/Linux systems, both methods are used by various mail
-   programs.  I assume that most people are using newer mailers that
-   have heard of flock.  Change this if you need to. */
-/* Debian contains a patch which says: ``On Debian/GNU/Linux systems,
-   configure gets the right answers, and that means *NOT* using flock.
-   Using flock is guaranteed to be the wrong thing. See Debian Policy
-   for details.'' and then uses `#ifdef DEBIAN'.  Unfortunately the
-   Debian maintainer hasn't provided a clean fix for Emacs.
-   movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and
-   HAVE_MAILLOCK_H are defined, so the following appears to be the
-   correct logic.  -- fx */
-/* We must check for HAVE_LIBLOCKFILE too, as movemail does.
-   liblockfile is a Free Software replacement for libmail, used on
-   Debian systems and elsewhere. -rfr */
-
-#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \
-      defined (HAVE_MAILLOCK_H))
-#define MAIL_USE_FLOCK
-#endif
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* Here, on a separate page, add any special hacks needed
@@ -146,45 +110,24 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 
-/* This is needed for dispnew.c:update_frame */
-
+/* This is needed for dispnew.c:update_frame.  */
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
 #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
-/* new C libio names */
+/* New C libio names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #elif defined (__UCLIBC__)
-/* using the uClibc library */
+/* Using the uClibc library.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->__bufpos - (FILE)->__bufstart)
 #else /* !_IO_STDIO_H && ! __UCLIBC__ */
-/* old C++ iostream names */
+/* Old C++ iostream names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_pptr - (FILE)->_pbase)
 #endif /* !_IO_STDIO_H && ! __UCLIBC__ */
 #endif /* emacs */
 
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
-
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-
-/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-   says where to find X windows at run time.  */
-
-#ifdef __mips__
-#define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX
-#else
-#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
-#endif /* __mips__ */
-
-/* Link temacs with -z nocombreloc so that unexec works right, whether or
-   not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
-   switches, so this also works with older versions that don't implement
-   -z combreloc.  */
-#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc
-
 #ifdef emacs
 #define INTERRUPT_INPUT
 #endif
@@ -192,24 +135,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SYSV_SYSTEM_DIR       /* use dirent.h */
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
-#define POSIX_SIGNALS
-
-#undef LIB_GCC
-#define LIB_GCC
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-
-/* _BSD_SOURCE is redundant, at least in glibc2, since we define
-   _GNU_SOURCE.  Left in in case it's relevant to libc5 systems and
-   anyone's still using Emacs on those.  --fx 2002-12-14  */
-#define C_SWITCH_SYSTEM -D_BSD_SOURCE
-
-/* Paul Abrahams <abrahams@equinox.shaysnet.com> says this is needed.  */
-#define LIB_MOTIF -lXm -lXpm
-
-#ifdef HAVE_LIBNCURSES
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-#endif
 
 #define UNEXEC unexelf.o
 
@@ -220,11 +145,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_XRMSETDATABASE
 #endif
 
-/* Use BSD process groups, but use setpgid() instead of setpgrp() to
-   actually set a process group. */
-/* Interesting: only GNU/Linux defines this,  but the BSDs do not... */
-#define BSD_PGRPS
-
 #define NARROWPROTO 1
 
 /* Use mmap directly for allocating larger buffers.  */
@@ -233,8 +153,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 /* Not all the architectures are tested, but there are Debian packages
    for SCM and/or Guile on them, so the technique must work.  See also
    comments in alloc.c concerning setjmp and gcc.  Fixme:  it's
@@ -242,7 +161,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    register window-flushing.  */
 /* Don't use #cpu here since in newest development versions of GCC,
    we must call cpp with -traditional, and that disables #cpu.  */
-
 #if defined __i386__ || defined __sparc__ || defined __mc68000__ \
     || defined __alpha__ || defined __mips__ || defined __s390__ \
     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
diff --git a/src/s/gnu.h b/src/s/gnu.h
index bf68cabe051..9f6fe52a5de 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -28,13 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SIGNALS_VIA_CHARACTERS
 
-/* Tell Emacs that we are a terminfo based system; disable the use
-   of local termcap.  (GNU uses ncurses.) */
-#ifdef HAVE_LIBNCURSES
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-#endif
-
 /* Use mmap directly for allocating larger buffers.  */
 #ifdef DOUG_LEA_MALLOC
 #undef REL_ALLOC
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index e56b25ecaee..91988ef6727 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,6 +1,7 @@
 /* System description file for hpux version 10.20.
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,56 +21,39 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define RUN_TIME_REMAP
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #define USG                             /* System III, System V, etc */
-
 #define USG5
-
 #define HPUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "hpux"
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
-
+   if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'
 
-/*
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIO
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
-
 #define HAVE_SOCKETS
 
 /* Define this symbol if your system has the functions bcopy, etc.
- * s800 and later versions of s300 (s200) kernels have equivalents
- * of the BSTRING functions of BSD.  If your s200 kernel doesn't have
- * em comment out this section.
- */
-
+   s800 and later versions of s300 (s200) kernels have equivalents
+   of the BSTRING functions of BSD.  If your s200 kernel doesn't have
+   em comment out this section.  */
 #define BSTRING
 
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* The symbol in the kernel where the load average is found
@@ -77,23 +61,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* Use the system provided termcap(3) library */
-#define TERMINFO
-
 /* In hpux, the symbol SIGIO is defined, but the feature
    doesn't work in the way Emacs needs it to.  */
-
 #define BROKEN_SIGIO
 
 /* Some additional system facilities exist.  */
-
 #define HAVE_PERROR  /* Delete this line for version 6.  */
 
 #define UNEXEC unexhp9k800.o
 
-/* Include the file bsdtty.h, since this machine has job control.  */
-#define NEED_BSDTTY
-
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
@@ -105,17 +81,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This triggers a conditional in xfaces.c.  */
 #define XOS_NEEDS_TIME_H
 
-/* Don't use shared libraries.  unexec doesn't handle them.
-   Note GCC automatically passes -a archive to ld, and it has its own
-   conflicting -a.  */
-#define LD_SWITCH_SYSTEM_TEMACS
-
-#ifndef HAVE_LIBXMU
-/* HP-UX doesn't supply Xmu.  */
-#define LIBXMU
-
-#endif
-
 /* Assar Westerlund <assar@sics.se> says this is necessary for
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES
@@ -128,7 +93,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    version number A.09.05.
 
    You can fix the math library by installing patch number PHSS_4630.
-   But we can fix it more reliably for Emacs like this. */
+   But we can fix it more reliably for Emacs like this.  */
 #undef HAVE_RINT
 
 /* We have to go this route, rather than hpux9's approach of renaming the
@@ -143,35 +108,56 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* AlainF 20-Jul-1996 says this is right.  */
 #define KERNEL_FILE "/stand/vmunix"
 
-#define LIBS_SYSTEM -l:libdld.sl
 
 /* Rainer Malzbender <rainer@displaytech.com> says definining
-   HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
-   using GCC.  */
-
+   HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC.  */
 #ifndef HAVE_XRMSETDATABASE
 #define HAVE_XRMSETDATABASE
 #endif
 
-/* Make sure we get select from libc rather than from libcurses
-   because libcurses on HPUX 10.10 has a broken version of select.
-   We used to use -lc -lcurses, but this may be cleaner.  */
-#define LIBS_TERMCAP -ltermcap
-
-/* However, HPUX 10 puts Xaw and Xmu in a strange place
-   (if you install them at all).  So search that place.  */
-#define C_SWITCH_X_SYSTEM  -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/contrib/X11R5/include
-#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/Motif1.2 -L/usr/contrib/X11R5/lib
-
 /* 2000-11-21: Temporarily disable Unix 98 large file support found by
    configure.  It fails on HPUX 11, at least, because it enables
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
-
 #undef _FILE_OFFSET_BITS
 
-/* otherwise sigunblock wont be defined */
-#define POSIX_SIGNALS
+/* Define NO_REMAP if memory segmentation makes it not work well
+   to change the boundary between the text section and data section
+   when Emacs is dumped.  If you define this, the preloaded Lisp
+   code will not be sharable; but that's better than failing completely.  */
+#define NO_REMAP
+
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+   pure and impure space as loaded can vary, and even their
+   relative order cannot be relied on.
+
+   Otherwise Emacs assumes that text space precedes data space,
+   numerically.  */
+#define VIRT_ADDR_VARIES
+
+/* The data segment on this machine always starts at address 0x40000000.  */
+#define DATA_SEG_BITS 0x40000000
+
+#define DATA_START    0x40000000
+#define TEXT_START    0x00000000
+
+/* Data type of load average, as read out of kmem.  */
+#define LOAD_AVE_TYPE double
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
+
+/* The kernel symbol where the load average is found is named _avenrun.
+   At this time there are two major flavors of hp-ux (there is the s800
+   and s300 (s200) flavors).  The differences are thusly moved to the
+   corresponding machine description file.  */
+
+/* No underscore please.  */
+#define LDAV_SYMBOL "avenrun"
+
+/* On USG systems these have different names.  */
+#define index strchr
+#define rindex strrchr
 
 /* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
    (do not change this comment) */
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 3382395a90f..48f60841047 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -1,10 +1,5 @@
 #include "hpux10-20.h"
 
-#ifdef POSIX_SIGNALS
-#undef POSIX_SIGNALS
-#endif
-#define POSIX_SIGNALS 1
-
 /* SA_RESTART resets the timeout of `select', so don't use it.  */
 #define BROKEN_SA_RESTART
 
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 0a0b0d4af26..e9e14f0cf35 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -27,10 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SETPGRP_RELEASES_CTTY
 
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-
 #ifdef SYSTEM_TYPE
 #undef SYSTEM_TYPE
 #endif
@@ -44,6 +40,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Make process_send_signal work by "typing" a signal character on the pty.  */
 #define SIGNALS_VIA_CHARACTERS
 
+/* Letter to use in finding device name of first pty,
+   if system supports pty's.  'a' means it is /dev/ptya0  */
+#undef FIRST_PTY_LETTER
+#define FIRST_PTY_LETTER 'q'
+
 /* No need to use sprintf to get the tty name--we get that from _getpty.  */
 #define PTY_TTY_NAME_SPRINTF
 /* No need to get the pty name at all.  */
@@ -84,21 +85,10 @@ char *_getpty();
 
 #define UNEXEC unexelf.o
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-#define MAIL_USE_FLOCK
-
 #define NARROWPROTO 1
 
 #define USE_MMAP_FOR_BUFFERS 1
 
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
-   (do not change this comment) */
-
-
 #if _MIPS_SZLONG == 64          /* -mabi=64 (gcc) or -64 (MIPSpro) */
 #define _LP64                   /* lisp.h takes care of the rest */
 #endif /* _MIPS_SZLONG */
@@ -111,5 +101,8 @@ char *_getpty();
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
+/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
+   (do not change this comment) */
+
 /* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
    (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 3e5c65eaab5..2d6cc2f4bd5 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,6 +1,7 @@
 /* System description file for Windows NT.
-   Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,10 +18,8 @@ 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/>.  */
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 
 #ifndef WINDOWSNT
 #define WINDOWSNT
@@ -30,71 +29,55 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 /* If you are compiling with a non-C calling convention but need to
-   declare vararg routines differently, put it here */
+   declare vararg routines differently, put it here.  */
 #define _VARARGS_ __cdecl
 
 /* If you are providing a function to something that will call the
    function back (like a signal handler and signal, or main) its calling
-   convention must be whatever standard the libraries expect */
+   convention must be whatever standard the libraries expect.  */
 #define _CALLBACK_ __cdecl
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "windows-nt"
 #define SYMS_SYSTEM syms_of_ntterm ()
 
 #define NO_MATHERR 1
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
+   if system supports pty's.  'a' means it is /dev/ptya0  */
 #define FIRST_PTY_LETTER 'a'
 
-/*
- *      Define HAVE_TIMEVAL if the system supports the BSD style clock values.
- *      Look in <sys/time.h> for a timeval structure.
- */
-
+/* Define HAVE_TIMEVAL if the system supports the BSD style clock values.
+   Look in <sys/time.h> for a timeval structure.  */
 #define HAVE_TIMEVAL 1
 
-/* NT supports Winsock which is close enough (with some hacks) */
-
+/* NT supports Winsock which is close enough (with some hacks).  */
 #define HAVE_SOCKETS 1
 
 /* But our select implementation doesn't allow us to make non-blocking
    connects.  So until that is fixed, this is necessary:  */
-
 #define BROKEN_NON_BLOCKING_CONNECT 1
 
 /* And the select implementation does 1-byte read-ahead waiting
    for received packets, so datagrams are broken too.  */
-
 #define BROKEN_DATAGRAM_SOCKETS 1
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 #define bzero(b, l) memset(b, 0, l)
 #define bcopy(s, d, l) memmove(d, s, l)
 #define bcmp(a, b, l) memcmp(a, b, l)
 
-/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe */
+/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe.  */
 #define GAP_USE_BCOPY 1
 #define BCOPY_UPWARD_SAFE 1
 #define BCOPY_DOWNWARD_SAFE 1
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-
+   preprocessor symbol "COFF".  */
 #define COFF 1
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-/* #define MAIL_USE_FLOCK */
 #define MAIL_USE_POP 1
 #define MAIL_USE_SYSTEM_LOCK 1
 
@@ -106,24 +89,33 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* ============================================================ */
 
-/* Here, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, add any special hacks needed to make Emacs work on this
+   system.  For example, you might define certain system call names
+   that don't exist on your system, or that do different things on
+   your system and must be used only through an encapsulation (which
+   you should place, by convention, in sysdep.c).  */
 
-/* Define this to be the separator between path elements */
+/* Define this to be the separator between path elements.  */
 #define DIRECTORY_SEP XINT (Vdirectory_sep_char)
 
-/* Define this to be the separator between devices and paths */
+/* Define this to be the separator between devices and paths.  */
 #define DEVICE_SEP ':'
 
 /* We'll support either convention on NT.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
-/* The null device on Windows NT. */
+#include <sys/types.h>
+struct sigaction {
+  int sa_flags;
+  void (*sa_handler)(int);
+  sigset_t sa_mask;
+};
+#define SIG_BLOCK       1
+#define SIG_SETMASK     2
+#define SIG_UNBLOCK     3
+
+/* The null device on Windows NT.  */
 #define NULL_DEVICE     "NUL:"
 
 #ifndef MAXPATHLEN
@@ -213,11 +205,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
 
-/* get some redefinitions in place */
+/* Get some redefinitions in place.  */
 
 #ifdef emacs
 
-/* calls that are emulated or shadowed */
+/* Calls that are emulated or shadowed.  */
 #undef access
 #define access  sys_access
 #undef chdir
@@ -254,15 +246,26 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef write
 #define write   sys_write
 
-/* subprocess calls that are emulated */
+/* Subprocess calls that are emulated.  */
 #define spawnve sys_spawnve
 #define wait    sys_wait
 #define kill    sys_kill
 #define signal  sys_signal
 
+/* termcap.c calls that are emulated.  */
+#define tputs   sys_tputs
+#define tgetstr sys_tgetstr
+
+/* cm.c calls that are emulated.  */
+#define chcheckmagic sys_chcheckmagic
+#define cmcostinit   sys_cmcostinit
+#define cmgoto       sys_cmgoto
+#define cmputc       sys_cmputc
+#define Wcm_clear    sys_Wcm_clear
+
 #endif /* emacs */
 
-/* map to MSVC names */
+/* Map to MSVC names.  */
 #define execlp    _execlp
 #define execvp    _execvp
 #define fdopen    _fdopen
@@ -296,8 +299,8 @@ typedef int pid_t;
 #define utime     _utime
 #endif
 
-/* this is hacky, but is necessary to avoid warnings about macro
-   redefinitions using the SDK compilers */
+/* This is hacky, but is necessary to avoid warnings about macro
+   redefinitions using the SDK compilers.  */
 #ifndef __STDC__
 #define __STDC__ 1
 #define MUST_UNDEF__STDC__
@@ -310,7 +313,7 @@ typedef int pid_t;
 #undef MUST_UNDEF__STDC__
 #endif
 
-/* Defines that we need that aren't in the standard signal.h  */
+/* Defines that we need that aren't in the standard signal.h.  */
 #define SIGHUP  1               /* Hang up */
 #define SIGQUIT 3               /* Quit process */
 #define SIGTRAP 5               /* Trace trap */
@@ -353,8 +356,7 @@ extern char *get_emacs_configuration_options (void);
 
 #include <sys/stat.h>
 
-/* Define for those source files that do not include enough NT
-   system files.  */
+/* Define for those source files that do not include enough NT system files.  */
 #ifndef NULL
 #ifdef __cplusplus
 #define NULL    0
@@ -389,7 +391,7 @@ extern char *get_emacs_configuration_options (void);
    removed.  Also, obviously, all files that define initialized data
    must include config.h to pick up this pragma.  */
 
-/* Names must be < 8 bytes */
+/* Names must be < 8 bytes.  */
 #ifdef _MSC_VER
 #pragma data_seg("EMDATA")
 #pragma bss_seg("EMBSS")
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 115ec05b0a4..90f630c8627 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,7 +1,7 @@
 /* System description file for MS-DOS
 
-   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -21,11 +21,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
-
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 #ifndef MSDOS
 #define MSDOS
 #endif
@@ -38,46 +35,34 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #undef BSD_SYSTEM
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "ms-dos"
 
 #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select()
 
-/* NOMULTIPLEJOBS should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one).  */
-
-#define NOMULTIPLEJOBS
-
 #define SYSV_SYSTEM_DIR
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* Define this is the compiler understands `volatile'.  */
 #define HAVE_VOLATILE
 
 
-/* subprocesses should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
+/* subprocesses should be defined if you want to have code for
+   asynchronous subprocesses (as used in M-x compile and M-x shell).
    This is the only system that needs this.  */
-
 #undef subprocesses
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
-
+   preprocessor symbol "COFF".  */
 #define COFF
 
-/* Here, on a separate page, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, on a separate page, add any special hacks needed to make
+   Emacs work on this system.  For example, you might define certain
+   system call names that don't exist on your system, or that do
+   different things on your system and must be used only through an
+   encapsulation (which you should place, by convention, in sysdep.c).  */
 
 /* Avoid incompatibilities between gmalloc.c and system header files
    in how to declare valloc.  */
@@ -89,7 +74,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
-
 #define _setjmp setjmp
 #define _longjmp longjmp
 
@@ -101,7 +85,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #define ORDINARY_LINK
 
 /* command.com does not understand `...` so we define this.  */
-#define LIB_GCC -Lgcc
 #define SEPCHAR ';'
 
 #define NULL_DEVICE "nul"
@@ -116,17 +99,17 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 :AB=<BG %d>:AF=<FG %d>:op=<DefC>:"
 
 /* Define this to a function (Fdowncase, Fupcase) if your file system
-   likes that */
+   likes that.  */
 #define FILE_SYSTEM_CASE Fmsdos_downcase_filename
 
-/* Define this to be the separator between devices and paths */
+/* Define this to be the separator between devices and paths.  */
 #define DEVICE_SEP ':'
 
 /* We'll support either convention on MSDOG.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
-/* bcopy under djgpp is quite safe */
+/* bcopy under djgpp is quite safe.  */
 #define GAP_USE_BCOPY
 #define BCOPY_UPWARD_SAFE 1
 #define BCOPY_DOWNWARD_SAFE 1
@@ -134,13 +117,10 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 /* Mode line description of a buffer's type.  */
 #define MODE_LINE_BINARY_TEXT(buf) (NILP(buf->buffer_file_type) ? "T" : "B")
 
-/* Do we have POSIX signals?  */
-#define POSIX_SIGNALS
-
 /* We have (the code to control) a mouse.  */
 #define HAVE_MOUSE
 
-/* We canuse mouse menus.  */
+/* We can use mouse menus.  */
 #define HAVE_MENUS
 
 /* Define one of these for easier conditionals.  */
@@ -149,7 +129,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    commentary below, in the non-X branch.  The 140KB number was
    measured on GNU/Linux and on MS-WIndows.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
-#define LIBS_SYSTEM -lxext -lsys
 #else
 /* We need a little extra space, see ../../lisp/loadup.el.
    As of 20091024, DOS-specific files use up 62KB of pure space.  But
@@ -164,15 +143,11 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #endif
 
 /* Tell the garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
 #define NO_REMAP
 
-#define UNEXEC unexec.o
-
 /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
    (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 682b9482352..b8df9014ecc 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,7 +1,7 @@
 /* s/ file for netbsd system.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,55 +19,19 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* Get most of the stuff from bsd-common */
+/* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
 #define HAVE_GETLOADAVG 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#define LIBS_TERMCAP -ltermcap
-
-#define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
-#undef LIB_GCC
-#define LIB_GCC
-
-#ifdef HAVE_CRTIN
-#define START_FILES_1 /usr/lib/crti.o 
-#define END_FILES_1 /usr/lib/crtn.o
-#else
-#define START_FILES_1
-#define END_FILES_1
-#endif
-
 #define AMPERSAND_FULL_NAME
 
-/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-   says where to find X windows at run time.  We convert it to a -rpath option
-   which is what OSF1 uses.  */
-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
-
-/* The following is needed to make `configure' find Xpm, Xaw3d and
-   image include and library files if using /usr/bin/gcc.  That
-   compiler seems to be modified to not find headers in
-   /usr/local/include or libs in /usr/local/lib by default.  */
-
-#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
-
-/* Link temacs with -z nocombreloc so that unexec works right, whether or
-   not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
-   switches, so this also works with older versions that don't implement
-   -z combreloc.  */
-
-#define LD_SWITCH_SYSTEM_TEMACS -Wl,-z,nocombreloc
-
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
    the library search parth, i.e. it won't search /usr/lib
-   for libc and friends. Using -nostartfiles instead avoids
-   this problem, and will also work on earlier NetBSD releases */
-
+   for libc and friends.  Using -nostartfiles instead avoids
+   this problem, and will also work on earlier NetBSD releases.  */
 #define LINKER $(CC) -nostartfiles
 
 #define DEFAULT_SOUND_DEVICE "/dev/audio"
@@ -75,7 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Greg A. Woods <woods@weird.com> says we must include signal.h
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */
-
 #ifndef NOT_C_CODE
 #include <signal.h>
 #endif
@@ -83,23 +46,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Don't close pty in process.c to make it as controlling terminal.
    It is already a controlling terminal of subprocess, because we did
    ioctl TIOCSCTTY.  */
-
 #define DONT_REOPEN_PTY
 
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
+   registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
-
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* Use sigprocmask and friends instead of sigblock;
-   sigblock is considered obsolete on NetBSD.  */
-
-#define POSIX_SIGNALS   1
-
 /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
    (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index a74601d3ad8..d9d60e3b868 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -1,32 +1,7 @@
-/* s/ file for openbsd systems.  */
+/* System file for openbsd.  */
 
-/* Mostly the same as NetBSD.  */
+/* The same as NetBSD.  Note there are differences in configure.  */
 #include "netbsd.h"
 
-/*  This very-badly named symbol is conditionally defined in netbsd.h.
-    Better would be either to not need it in the first place, or to choose
-    a more descriptive name.  */
-#ifndef LD_SWITCH_SYSTEM_tmp
-#define LD_SWITCH_SYSTEM_tmp /* empty */
-#endif
-
-/*  David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
-    is necessary.  Otherwise Emacs dumps core when run -nw.  */
-#undef LIBS_TERMCAP
-
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-
-#undef LD_SWITCH_SYSTEM_TEMACS
-#undef LD_SWITCH_SYSTEM
-
-  /*  Han Boetes <han@mijncomputer.nl> says this
-      is necessary,  otherwise Emacs dumps core on elf systems.  */
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Z
-
-/* The version of gcc on OpenBSD doesn't search /usr/local/lib by
-   default.  */
-#define LD_SWITCH_X_DEFAULT -L/usr/local/lib
-
 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
    (do not change this comment) */
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index 865e17525c4..fd74ae798c9 100644
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -4,20 +4,18 @@
 
 #define SYSTEM_MALLOC
 
-/*
- * Use the Solaris dldump() function, called from unexsol.c, to dump
- * emacs, instead of the generic ELF dump code found in unexelf.c.
- * The resulting binary has a complete symbol table, and is better
- * for debugging and other observabilty tools (debuggers, pstack, etc).
- *
- * If you encounter a problem using dldump(), please consider sending
- * a message to the OpenSolaris tools-linking mailing list:
- *      http://mail.opensolaris.org/mailman/listinfo/tools-linking
- *
- * It is likely that dldump() works with older Solaris too,
- * but this has not been tested, and so, this change is for
- * Solaris 10 and newer only at this time.
- */
+/* Use the Solaris dldump() function, called from unexsol.c, to dump
+   emacs, instead of the generic ELF dump code found in unexelf.c.
+   The resulting binary has a complete symbol table, and is better
+   for debugging and other observabilty tools (debuggers, pstack, etc).
+
+   If you encounter a problem using dldump(), please consider sending
+   a message to the OpenSolaris tools-linking mailing list:
+        http://mail.opensolaris.org/mailman/listinfo/tools-linking
+
+   It is likely that dldump() works with older Solaris too,
+   but this has not been tested, and so, this change is for
+   Solaris 10 and newer only at this time.  */
 #undef UNEXEC
 #define UNEXEC unexsol.o
 
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 408a0a2ed02..f9a4c44d74e 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Solaris 2.6.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -27,8 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define POSIX
 
-#define LIBS_SYSTEM -lsocket -lnsl -lkstat
-
 /* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
    ghazi@caip.rutgers.edu, 7/21/97.  Don't redefine if already defined
    (e.g., by config.h). */
@@ -38,19 +36,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
    XIM support.  */
-
 #define INHIBIT_X11R6_XIM
 
-/* Must use the system's termcap, if we use any termcap.
-   It does special things.  */
-
-#ifndef TERMINFO
-#define LIBS_TERMCAP -ltermcap
-#endif
-
 /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
-   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
-   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
+   rather than sighold/sigrelse, which appear to be BSD4.1 specific.
+   It may also be appropriate for SVR4.x
    (x<2) but I'm not sure.   fnf@cygnus.com */
 /* This sets the name of the slave side of the PTY.  On SysVr4,
    grantpt(3) forks a subprocess, so keep sigchld_handler() from
@@ -73,35 +63,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     pty_name[sizeof (pty_name) - 1] = 0;        \
   }
 
-/* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet.
-   Instead, dynamically check whether USE_MOTIF expands to something.  */
-#define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; }
-
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \
-  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'`
-#else /* GCC */
-/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
-   has anything in it.  It can be empty.
-   This works ok in temacs.  */
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
- `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
-  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
-
-/* Get rid of -traditional and let const really do its thing.  */
-#undef C_SWITCH_SYSTEM
-#undef const
-#endif /* GCC */
-
-/* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files
-   are in this directory on Solaris 2.4.  */
-#define C_SWITCH_X_SYSTEM -I/usr/dt/include
-
-/* -lgen is needed for the regex and regcmp functions
-   which are used by Motif.  In the future we can try changing
-   regex.c to provide them in Emacs, but this is safer for now.  */
-#define LIB_MOTIF -lXm -lgen
-
 /* This is the only known way to avoid some crashes
    that seem to relate to screwed up malloc data
    after deleting a frame.  */
diff --git a/src/s/template.h b/src/s/template.h
index e5fd2541c7b..16df03092d2 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,8 +1,9 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1992, 1999, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,10 +21,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/*
- *      Define symbols to identify the version of Unix this is.
- *      Define all the symbols that apply correctly.
- */
+/* Define symbols to identify the version of Unix this is.
+   Define all the symbols that apply correctly.  */
 
 /* #define USG5 */
 /* #define USG */
@@ -33,16 +32,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define BSD_SYSTEM */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
+   It sets the Lisp variable system-type.  */
 
 #define SYSTEM_TYPE "berkeley-unix"
 
-/* NOMULTIPLEJOBS should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one).  */
-
-/* #define NOMULTIPLEJOBS */
-
 /* Emacs can read input using SIGIO and buffering characters itself,
    or using CBREAK mode and making C-g cause SIGINT.
    The choice is controlled by the variable interrupt_input.
@@ -63,62 +56,46 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Another method of doing input is planned but not implemented.
    It would have Emacs fork off a separate process
    to read the input and send it to the true Emacs process
-   through a pipe. */
-
+   through a pipe.  */
 #define INTERRUPT_INPUT
 
 /* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
+   if system supports pty's.  'a' means it is /dev/ptya0.  */
 #define FIRST_PTY_LETTER 'a'
 
-/*
- *      Define HAVE_TERMIOS if the system provides POSIX-style
- *      functions and macros for terminal control.
- *
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- *
- *      Do not define both.  HAVE_TERMIOS is preferred, if it is
- *      supported on your system.
- */
+/* Define HAVE_TERMIOS if the system provides POSIX-style
+   functions and macros for terminal control.
+
+   Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.
+
+   Do not define both.  HAVE_TERMIOS is preferred, if it is
+   supported on your system.  */
 
 #define HAVE_TERMIOS
 /* #define HAVE_TERMIO */
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
-/* Define this symbol if your system has the functions bcopy, etc. */
-
+/* Define this symbol if your system has the functions bcopy, etc.  */
 #define BSTRING
 
 /* subprocesses should be undefined if you do NOT want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
-   Currently only MSDOS does not support this. */
+   Currently only MSDOS does not support this.  */
 
 /* #undef subprocesses */
 
 /* If your system uses COFF (Common Object File Format) then define the
-   preprocessor symbol "COFF". */
+   preprocessor symbol "COFF".  */
 
 /* #define COFF */
 
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-#define MAIL_USE_FLOCK
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
-
 #define CLASH_DETECTION
 
 /* Define this if your operating system declares signal handlers to
@@ -139,12 +116,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* ============================================================ */
 
-/* Here, add any special hacks needed
-   to make Emacs work on this system.  For example,
-   you might define certain system call names that don't
-   exist on your system, or that do different things on
-   your system and must be used only through an encapsulation
-   (Which you should place, by convention, in sysdep.c).  */
+/* Here, add any special hacks needed to make Emacs work on this
+   system.  For example, you might define certain system call names
+   that don't exist on your system, or that do different things on
+   your system and must be used only through an encapsulation (which
+   you should place, by convention, in sysdep.c).  */
 
 /* If the system's imake configuration file defines `NeedWidePrototypes'
    as `NO', we must define NARROWPROTO manually.  Such a define is
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 9fedb426868..864f09786b6 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,7 +1,7 @@
 /* s/ file for Unixware.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28,18 +28,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef HAVE_SYSV_SIGPAUSE
 
-/* Motif needs -lgen.  */
-#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
-
 /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
-   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
-   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
+   rather than sighold/sigrelse, which appear to be BSD4.1 specific.
+   It may also be appropriate for SVR4.x
    (x<2) but I'm not sure.   fnf@cygnus.com */
 /* This sets the name of the slave side of the PTY.  On SysVr4,
    grantpt(3) forks a subprocess, so keep sigchld_handler() from
    intercepting that death.  If any child but grantpt's should die
-   within, it should be caught after sigrelse(2). */
-
+   within, it should be caught after sigrelse(2).  */
 #define PTY_TTY_NAME_SPRINTF                    \
   {                                             \
     char *ptsname(), *ptyname;                  \
@@ -56,15 +52,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     pty_name[sizeof(pty_name) - 1] = 0;         \
   }
 
-/* Use libw.a along with X11R6 Xt.  */
-#define NEED_LIBW
+/* Data type of load average, as read out of kmem.  */
+#define LOAD_AVE_TYPE long
 
-/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
-   is needed in UNIX_SV ... 4.2 1.1.2.  */
-#define LIB_MOTIF -lXm -lXimp
-
-/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
-   (do not change this comment) */
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+/* This is totally uncalibrated. */
+#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
+#define FSCALE 256.0
 
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index b02caf9a3da..f870086368c 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,6 +1,10 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
+Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.
 
 This file is part of GNU Emacs.
 
@@ -17,61 +21,36 @@ 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/>.  */
 
-/* This file written by James Van Artsdalen of Dell Computer Corporation.
- * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
- * S. Raymond <esr@snark.thyrsus.com>.
- */
-
-/* Use the SysVr3 file for at least base configuration. */
-
+/* Use the SysVr3 file for at least base configuration.  */
 #define USG                             /* System III, System V, etc */
 
 #define USG5
 #define USG5_4
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
+   It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "usg-unix-v"
 
-/*
- *      Define HAVE_TERMIO if the system provides sysV-style ioctls
- *      for terminal control.
- */
-
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+   for terminal control.  */
 #define HAVE_TERMIO
 
-/*
- *      Define HAVE_PTYS if the system supports pty devices.
- */
-
-/*
- *      Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- *      library functions.  Almost, but not quite the same as
- *      the 4.2 functions
- */
+/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
+   functions. Almost, but not quite the same as the 4.2 functions.  */
 #define SYSV_SYSTEM_DIR
 
 /* The file containing the kernel's symbol table is called /unix.  */
-
 #define KERNEL_FILE "/unix"
 
-/* The symbol in the kernel where the load average is found
-   is named avenrun.  */
-
+/* The kernel symbol where the load average is found is named avenrun.  */
 #define LDAV_SYMBOL "avenrun"
 
-/* Special hacks needed to make Emacs run on this system.  */
-
-#define POSIX_SIGNALS
-
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
-
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems these have different names */
+/* On USG systems these have different names.  */
 #ifndef HAVE_INDEX
 #define index strchr
 #endif /* ! defined (HAVE_INDEX) */
@@ -79,41 +58,27 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define rindex strrchr
 #endif /* ! defined (HAVE_RINDEX) */
 
-/* Use terminfo instead of termcap.  */
-
-#define TERMINFO
-
-
-/* The docs for system V/386 suggest v.3 has sigpause,
-   so let's give it a try.  */
+/* The docs for system V/386 suggest v.3 has sigpause, so let's try it.  */
 #define HAVE_SYSV_SIGPAUSE
 
-
-/* If we're using the System V X port, BSD bstring functions will be handy */
-
+/* If we're using the System V X port, BSD bstring functions will be handy.  */
 #ifdef HAVE_X_WINDOWS
 #define BSTRING
 #endif /* HAVE_X_WINDOWS */
 
-/* On USG systems signal handlers return void */
-
+/* On USG systems signal handlers return void.  */
 #define SIGTYPE void
 
 #define ORDINARY_LINK
 
-#define LIB_STANDARD
-
-/* Undump with ELF */
-
+/* Undump with ELF.  */
 #undef COFF
 
 #define UNEXEC unexelf.o
 
-/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct
- * tchars. But get <termio.h> first to make sure ttold.h doesn't
- * interfere.  And don't try to use SIGIO yet.
- */
-
+/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
+   But get <termio.h> first to make sure ttold.h doesn't interfere.
+   And don't try to use SIGIO yet.  */
 #ifndef NOT_C_CODE
 #include <sys/wait.h>
 #endif
@@ -130,15 +95,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
- * instead, there's a system variable _sys_nsig.  Unfortunately, we need the
- * constant to dimension an array.  So wire in the appropriate value here.
- */
+   instead, there's a system variable _sys_nsig.  Unfortunately, we need the
+   constant to dimension an array.  So wire in the appropriate value here.  */
 #define NSIG_MINIMUM 32
 
-/* We can support this */
-
+/* We can support this.  */
 #define CLASH_DETECTION
 
+/* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 #define HAVE_TERMIOS
 
@@ -146,7 +110,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    waiting, because a previous waitsys(2) cleaned up the carcass of child
    without clearing the SIGCHLD pending info.  So, use a non-blocking
    wait3 instead, which maps to waitpid(2) in SysVr4. */
-
 #define wait3(status, options, rusage) \
   waitpid ((pid_t) -1, (status), (options))
 #define WRETCODE(w) (w >> 8)
@@ -154,20 +117,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
    subprocesses the usual way.  But TIOCSIGNAL does work for PTYs, and
    this is all we need.  */
-
 #define TIOCSIGSEND TIOCSIGNAL
 
 /* This change means that we don't loop through allocate_pty too many
-   times in the (rare) event of a failure. */
-
+   times in the (rare) event of a failure.  */
 #define FIRST_PTY_LETTER 'z'
 
-/* This sets the name of the master side of the PTY. */
-
+/* This sets the name of the master side of the PTY.  */
 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
 
-/* Push various streams modules onto a PTY channel. */
-
+/* Push various streams modules onto a PTY channel.  */
 #define SETUP_SLAVE_PTY \
   if (ioctl (xforkin, I_PUSH, "ptem") == -1)    \
     fatal ("ioctl I_PUSH ptem", errno);         \
@@ -176,8 +135,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
     fatal ("ioctl I_PUSH ttcompat", errno);
 
-/* This definition was suggested for next release.
-   So give it a try.  */
+/* This definition was suggested for next release.  So give it a try.  */
 #define HAVE_SOCKETS
 
 /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
diff --git a/src/syntax.c b/src/syntax.c
index a80f047e43c..4741fa260d2 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -858,7 +858,7 @@ are listed in the documentation of `modify-syntax-entry'.  */)
      Lisp_Object character;
 {
   int char_int;
-  CHECK_NUMBER (character);
+  CHECK_CHARACTER (character);
   char_int = XINT (character);
   SETUP_BUFFER_SYNTAX_TABLE ();
   return make_number (syntax_code_spec[(int) SYNTAX (char_int)]);
diff --git a/src/sysdep.c b/src/sysdep.c
index 506af23ef30..1e114655b4e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -73,7 +73,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 
 #ifdef HAVE_SETPGID
-#if !defined (USG) || defined (BSD_PGRPS)
+#if !defined (USG)
 #undef setpgrp
 #define setpgrp setpgid
 #endif
@@ -419,7 +419,10 @@ wait_for_termination (pid)
       else
         sigpause (SIGEMPTYMASK);
 #else /* not BSD_SYSTEM, and not HPUX version >= 6 */
-#ifdef POSIX_SIGNALS    /* would this work for GNU/Linux as well? */
+#ifdef WINDOWSNT
+      wait (0);
+      break;
+#else /* not WINDOWSNT */
       sigblock (sigmask (SIGCHLD));
       errno = 0;
       if (kill (pid, 0) == -1 && errno == ESRCH)
@@ -429,29 +432,7 @@ wait_for_termination (pid)
         }
 
       sigsuspend (&empty_mask);
-#else /* not POSIX_SIGNALS */
-#ifdef HAVE_SYSV_SIGPAUSE
-      sighold (SIGCHLD);
-      if (0 > kill (pid, 0))
-        {
-          sigrelse (SIGCHLD);
-          break;
-        }
-      sigpause (SIGCHLD);
-#else /* not HAVE_SYSV_SIGPAUSE */
-#ifdef WINDOWSNT
-      wait (0);
-      break;
-#else /* not WINDOWSNT */
-      if (0 > kill (pid, 0))
-        break;
-      /* Using sleep instead of pause avoids timing error.
-         If the inferior dies just before the sleep,
-         we lose just one second.  */
-      sleep (1);
 #endif /* not WINDOWSNT */
-#endif /* not HAVE_SYSV_SIGPAUSE */
-#endif /* not POSIX_SIGNALS */
 #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */
 #else /* not subprocesses */
       break;
@@ -546,11 +527,6 @@ child_setup_tty (out)
 #endif /* not SIGNALS_VIA_CHARACTERS */
 
 #ifdef AIX
-/* AIX enhanced edit loses NULs, so disable it */
-#ifndef IBMR2AIX
-  s.main.c_line = 0;
-  s.main.c_iflag &= ~ASCEDIT;
-#endif
   /* Also, PTY overloads NUL and BREAK.
      don't ignore break, but don't signal either, so it looks like NUL.  */
   s.main.c_iflag &= ~IGNBRK;
@@ -883,65 +859,7 @@ unrequest_sigio ()
 #endif /* FASYNC */
 #endif /* F_SETFL */
 #endif /* SIGIO */
-
-/* Saving and restoring the process group of Emacs's terminal.  */
-
-#ifdef BSD_PGRPS
-
-/* The process group of which Emacs was a member when it initially
-   started.
-
-   If Emacs was in its own process group (i.e. inherited_pgroup ==
-   getpid ()), then we know we're running under a shell with job
-   control (Emacs would never be run as part of a pipeline).
-   Everything is fine.
-
-   If Emacs was not in its own process group, then we know we're
-   running under a shell (or a caller) that doesn't know how to
-   separate itself from Emacs (like sh).  Emacs must be in its own
-   process group in order to receive SIGIO correctly.  In this
-   situation, we put ourselves in our own pgroup, forcibly set the
-   tty's pgroup to our pgroup, and make sure to restore and reinstate
-   the tty's pgroup just like any other terminal setting.  If
-   inherited_group was not the tty's pgroup, then we'll get a
-   SIGTTmumble when we try to change the tty's pgroup, and a CONT if
-   it goes foreground in the future, which is what should happen.
-
-   This variable is initialized in emacs.c.  */
-int inherited_pgroup;
-
-/* Split off the foreground process group to Emacs alone.  When we are
-   in the foreground, but not started in our own process group,
-   redirect the tty device handle FD to point to our own process
-   group.  We need to be in our own process group to receive SIGIO
-   properly.  */
-static void
-narrow_foreground_group (int fd)
-{
-  int me = getpid ();
 
-  setpgrp (0, inherited_pgroup);
-#if 0
-  /* XXX inherited_pgroup should not be zero here, but GTK seems to
-     mess this up. */
-  if (! inherited_pgroup)
-    abort ();                   /* Should not happen. */
-#endif
-  if (inherited_pgroup != me)
-      EMACS_SET_TTY_PGRP (fd, &me); /* XXX This only works on the controlling tty. */
-  setpgrp (0, me);
-}
-
-/* Set the tty to our original foreground group.  */
-static void
-widen_foreground_group (int fd)
-{
-  if (inherited_pgroup != getpid ())
-    EMACS_SET_TTY_PGRP (fd, &inherited_pgroup);
-  setpgrp (0, inherited_pgroup);
-}
-
-#endif /* BSD_PGRPS */
 
 /* Getting and setting emacs_tty structures.  */
 
@@ -1126,15 +1044,6 @@ init_sys_modes (tty_out)
   if (!tty_out->output)
     return;                     /* The tty is suspended. */
   
-#ifdef BSD_PGRPS
-#if 0
-  /* read_socket_hook is not global anymore.  I think doing this
-     unconditionally will not cause any problems. */
-  if (! read_socket_hook && EQ (Vinitial_window_system, Qnil))
-#endif
-    narrow_foreground_group (fileno (tty_out->input));
-#endif
-
   if (! tty_out->old_tty)
     tty_out->old_tty = (struct emacs_tty *) xmalloc (sizeof (struct emacs_tty));
       
@@ -1258,16 +1167,10 @@ init_sys_modes (tty_out)
 #endif /* mips or HAVE_TCATTR */
 
 #ifdef AIX
-#ifndef IBMR2AIX
-  /* AIX enhanced edit loses NULs, so disable it.  */
-  tty.main.c_line = 0;
-  tty.main.c_iflag &= ~ASCEDIT;
-#else
   tty.main.c_cc[VSTRT] = CDISABLE;
   tty.main.c_cc[VSTOP] = CDISABLE;
   tty.main.c_cc[VSUSP] = CDISABLE;
   tty.main.c_cc[VDSUSP] = CDISABLE;
-#endif /* IBMR2AIX */
   if (tty_out->flow_control)
     {
 #ifdef VSTART
@@ -1590,9 +1493,6 @@ reset_sys_modes (tty_out)
   dos_ttcooked ();
 #endif
 
-#ifdef BSD_PGRPS
-  widen_foreground_group (fileno (tty_out->input));
-#endif
 }
 
 #ifdef HAVE_PTYS
@@ -2101,10 +2001,10 @@ read_input_waiting ()
 /* POSIX signals support - DJB */
 /* Anyone with POSIX signals should have ANSI C declarations */
 
-#ifdef POSIX_SIGNALS
-
 sigset_t empty_mask, full_mask;
 
+#ifndef WINDOWSNT
+
 signal_handler_t
 sys_signal (int signal_number, signal_handler_t action)
 {
@@ -2133,6 +2033,8 @@ sys_signal (int signal_number, signal_handler_t action)
   return (old_action.sa_handler);
 }
 
+#endif  /* WINDOWSNT */
+
 #ifndef __GNUC__
 /* If we're compiling with GCC, we don't need this function, since it
    can be written as a macro.  */
@@ -2175,7 +2077,6 @@ sys_sigsetmask (sigset_t new_mask)
   return (old_mask);
 }
 
-#endif /* POSIX_SIGNALS */
 
 #if !defined HAVE_STRSIGNAL && !HAVE_DECL_SYS_SIGLIST
 static char *my_sys_siglist[NSIG];
@@ -2188,10 +2089,8 @@ static char *my_sys_siglist[NSIG];
 void
 init_signals ()
 {
-#ifdef POSIX_SIGNALS
   sigemptyset (&empty_mask);
   sigfillset (&full_mask);
-#endif
 
 #if !defined HAVE_STRSIGNAL && !HAVE_DECL_SYS_SIGLIST
   if (! initialized)
@@ -2709,13 +2608,6 @@ closedir (DIR *dirp /* stream from opendir */)
   int rtnval;
 
   rtnval = emacs_close (dirp->dd_fd);
-
-  /* Some systems (like Solaris) allocate the buffer and the DIR all
-     in one block.  Why in the world are we freeing this ourselves
-     anyway?  */
-#if ! defined (SOLARIS2)
-  xfree ((char *) dirp->dd_buf); /* directory block defined in <dirent.h> */
-#endif
   xfree ((char *) dirp);
 
   return rtnval;
diff --git a/src/syssignal.h b/src/syssignal.h
index f435d338594..9a145b78cb1 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -30,8 +30,6 @@ extern void init_signals P_ ((void));
 extern pthread_t main_thread;
 #endif
 
-#ifdef POSIX_SIGNALS
-
 /* Don't #include <signal.h>.  That header should always be #included
    before "config.h", because some configuration files (like s/hpux.h)
    indicate that SIGIO doesn't work by #undef-ing SIGIO.  If this file
@@ -87,15 +85,6 @@ sigset_t sys_sigsetmask P_ ((sigset_t new_mask));
 
 #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)
 
-#else /* ! defined (POSIX_SIGNALS) */
-
-#ifndef sigunblock
-#define sigunblock(SIG) \
-{ SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
-#endif
-
-#endif /* ! defined (POSIX_SIGNALS) */
-
 #ifndef SIGMASKTYPE
 #define SIGMASKTYPE int
 #endif
diff --git a/src/systty.h b/src/systty.h
index 057f58f6064..fcc6cf81e51 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -51,11 +51,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <termios.h>
 #endif
 
-#ifdef NEED_BSDTTY
+#ifdef HPUX
 #include <sys/bsdtty.h>
-#endif
-
-#if defined (HPUX) && defined (HAVE_PTYS)
 #include <sys/ptyio.h>
 #endif
 
@@ -63,7 +60,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/pty.h>
 #endif /* AIX */
 
-#if (defined (POSIX) || defined (NEED_UNISTD_H)) && defined (HAVE_UNISTD_H)
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/src/term.c b/src/term.c
index df7dc9ee464..fad6e3c80d7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1589,7 +1589,6 @@ append_glyph (it)
     }
 }
 
-
 /* Produce glyphs for the display element described by IT.  *IT
    specifies what we want to produce a glyph for (character, image, ...),
    and where in the glyph matrix we currently are (glyph row and hpos).
@@ -1808,6 +1807,17 @@ append_composite_glyph (it)
   glyph = it->glyph_row->glyphs[it->area] + it->glyph_row->used[it->area];
   if (glyph < it->glyph_row->glyphs[1 + it->area])
     {
+      /* If the glyph row is reversed, we need to prepend the glyph
+         rather than append it.  */
+      if (it->glyph_row->reversed_p && it->area == TEXT_AREA)
+        {
+          struct glyph *g;
+
+          /* Make room for the new glyph.  */
+          for (g = glyph - 1; g >= it->glyph_row->glyphs[it->area]; g--)
+            g[1] = *g;
+          glyph = it->glyph_row->glyphs[it->area];
+        }
       glyph->type = COMPOSITE_GLYPH;
       glyph->pixel_width = it->pixel_width;
       glyph->u.cmp.id = it->cmp_it.id;
@@ -1828,6 +1838,18 @@ append_composite_glyph (it)
       glyph->padding_p = 0;
       glyph->charpos = CHARPOS (it->position);
       glyph->object = it->object;
+      if (it->bidi_p)
+        {
+          glyph->resolved_level = it->bidi_it.resolved_level;
+          if ((it->bidi_it.type & 7) != it->bidi_it.type)
+            abort ();
+          glyph->bidi_type = it->bidi_it.type;
+        }
+      else
+        {
+          glyph->resolved_level = 0;
+          glyph->bidi_type = UNKNOWN_BT;
+        }
 
       ++it->glyph_row->used[it->area];
       ++glyph;
@@ -1889,12 +1911,16 @@ produce_special_glyphs (it, what)
 
   if (what == IT_CONTINUATION)
     {
-      /* Continuation glyph.  */
-      SET_GLYPH_FROM_CHAR (glyph, '\\');
+      /* Continuation glyph.  For R2L lines, we mirror it by hand.  */
+      if (it->bidi_it.paragraph_dir == R2L)
+        SET_GLYPH_FROM_CHAR (glyph, '/');
+      else
+        SET_GLYPH_FROM_CHAR (glyph, '\\');
       if (it->dp
           && (gc = DISP_CONTINUE_GLYPH (it->dp), GLYPH_CODE_P (gc))
           && GLYPH_CODE_CHAR_VALID_P (gc))
         {
+          /* FIXME: Should we mirror GC for R2L lines?  */
           SET_GLYPH_FROM_GLYPH_CODE (glyph, gc);
           spec_glyph_lookup_face (XWINDOW (it->window), &glyph);
         }
@@ -1907,6 +1933,7 @@ produce_special_glyphs (it, what)
           && (gc = DISP_TRUNC_GLYPH (it->dp), GLYPH_CODE_P (gc))
           && GLYPH_CODE_CHAR_VALID_P (gc))
         {
+          /* FIXME: Should we mirror GC for R2L lines?  */
           SET_GLYPH_FROM_GLYPH_CODE (glyph, gc);
           spec_glyph_lookup_face (XWINDOW (it->window), &glyph);
         }
@@ -2244,7 +2271,7 @@ set_tty_color_mode (tty, f)
      struct tty_display_info *tty;
      struct frame *f;
 {
-  Lisp_Object tem, val, color_mode_spec;
+  Lisp_Object tem, val;
   Lisp_Object color_mode;
   int mode;
   extern Lisp_Object Qtty_color_mode;
@@ -2256,12 +2283,13 @@ set_tty_color_mode (tty, f)
 
   if (INTEGERP (val))
     color_mode = val;
-  else
+  else if (SYMBOLP (tty_color_mode_alist))
     {
-      tem = (NILP (tty_color_mode_alist) ? Qnil
-             : Fassq (val, XSYMBOL (tty_color_mode_alist)->value));
+      tem = Fassq (val, Fsymbol_value (tty_color_mode_alist));
       color_mode = CONSP (tem) ? XCDR (tem) : Qnil;
     }
+  else
+    color_mode = Qnil;
 
   mode = INTEGERP (color_mode) ? XINT (color_mode) : 0;
 
@@ -3351,7 +3379,7 @@ dissociate_if_controlling_tty (int fd)
   EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */
   if (pgid != -1)
     {
-#if defined (USG) && !defined (BSD_PGRPS)
+#if defined (USG)
       setpgrp ();
       no_controlling_tty = 1;
 #elif defined (CYGWIN)
diff --git a/src/w16select.c b/src/w16select.c
index c6a84e46a60..9ebf6de6250 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -685,8 +685,8 @@ and t is the same as `SECONDARY'.  */)
      into the clipboard if we run under Windows, so we cannot check
      the clipboard alone.)  */
   if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY))
-      && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"),
-                                             Qnil))))
+      && ! NILP (Fsymbol_value (Fintern_soft (build_string ("kill-ring"),
+                                              Qnil))))
     return Qt;
 
   if (EQ (selection, QCLIPBOARD))
diff --git a/src/w32.c b/src/w32.c
index 2ff344abd65..0f2d8b54e6b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1482,6 +1482,30 @@ sigunblock (int sig)
 }
 
 int
+sigemptyset (sigset_t *set)
+{
+  return 0;
+}
+
+int
+sigaddset (sigset_t *set, int signo)
+{
+  return 0;
+}
+
+int
+sigfillset (sigset_t *set)
+{
+  return 0;
+}
+
+int
+sigprocmask (int how, const sigset_t *set, sigset_t *oset)
+{
+  return 0;
+}
+
+int
 setpgrp (int pid, int gid)
 {
   return 0;
diff --git a/src/w32console.c b/src/w32console.c
index c10f2181e7d..dcebe466e32 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -488,6 +488,62 @@ w32con_set_terminal_window (struct frame *f, int size)
 }
 
 /***********************************************************************
+                        stubs from termcap.c
+ ***********************************************************************/
+
+void
+sys_tputs (char *str, int nlines, int (*outfun)())
+{
+}
+
+char *
+sys_tgetstr (char *cap, char **area)
+{
+  return NULL;
+}
+
+
+/***********************************************************************
+                        stubs from cm.c
+ ***********************************************************************/
+
+struct tty_display_info *current_tty = NULL;
+int cost = 0;
+
+int
+evalcost (char c)
+{
+  return c;
+}
+
+int
+cmputc (char c)
+{
+  return c;
+}
+
+void
+cmcheckmagic (struct tty_display_info *tty)
+{
+}
+
+void
+cmcostinit (struct tty_display_info *tty)
+{
+}
+
+void
+cmgoto (struct tty_display_info *tty, int row, int col)
+{
+}
+
+void
+Wcm_clear (struct tty_display_info *tty)
+{
+}
+
+
+/***********************************************************************
                                 Faces
  ***********************************************************************/
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 795e7208569..bc310da0d2f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -47,6 +47,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "systime.h"
 #include "termhooks.h"
 #include "w32heap.h"
+#include "w32.h"
 
 #include "bitmaps/gray.xbm"
 
@@ -6333,6 +6334,7 @@ an integer representing a ShowWindow flag:
      Lisp_Object operation, document, parameters, show_flag;
 {
   Lisp_Object current_dir;
+  char *errstr;
 
   CHECK_STRING (document);
 
@@ -6353,7 +6355,17 @@ an integer representing a ShowWindow flag:
                            XINT (show_flag) : SW_SHOWDEFAULT))
       > 32)
     return Qt;
-  error ("ShellExecute failed: %s", w32_strerror (0));
+  errstr = w32_strerror (0);
+  /* The error string might be encoded in the locale's encoding.  */
+  if (!NILP (Vlocale_coding_system))
+    {
+      Lisp_Object decoded =
+        code_convert_string_norecord (make_unibyte_string (errstr,
+                                                           strlen (errstr)),
+                                      Vlocale_coding_system, 0);
+      errstr = (char *)SDATA (decoded);
+    }
+  error ("ShellExecute failed: %s", errstr);
 }
 
 /* Lookup virtual keycode from string representing the name of a
diff --git a/src/w32term.c b/src/w32term.c
index 7222e26efd2..0b71b7e02b7 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5136,10 +5136,12 @@ w32_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, act
         }
 
       if (glyph_row->exact_window_width_line_p
-          && w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA])
+          && (glyph_row->reversed_p
+              ? (w->phys_cursor.hpos < 0)
+              : (w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA])))
         {
           glyph_row->cursor_in_fringe_p = 1;
-          draw_fringe_bitmap (w, glyph_row, 0);
+          draw_fringe_bitmap (w, glyph_row, glyph_row->reversed_p);
           return;
         }
 
diff --git a/src/window.c b/src/window.c
index b9683fbbca8..882f76d9758 100644
--- a/src/window.c
+++ b/src/window.c
@@ -54,7 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
 Lisp_Object Qdisplay_buffer;
-Lisp_Object Qscroll_up, Qscroll_down;
+Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
 Lisp_Object Qwindow_size_fixed;
 
 extern Lisp_Object Qleft_margin, Qright_margin;
@@ -168,10 +168,6 @@ static Lisp_Object Vwindow_configuration_change_hook;
 
 Lisp_Object Vscroll_preserve_screen_position;
 
-/* List of commands affected by `Vscroll_preserve_screen_position'.  */
-
-Lisp_Object Vscroll_preserve_screen_position_commands;
-
 /* Non-nil means that text is inserted before window's markers.  */
 
 Lisp_Object Vwindow_point_insertion_type;
@@ -4946,12 +4942,13 @@ window_scroll_pixel_based (window, n, whole, noerror)
   if (!NILP (Vscroll_preserve_screen_position))
     {
       /* We preserve the goal pixel coordinate across consecutive
-         calls to scroll-up or scroll-down.  This avoids the
+         calls to scroll-up, scroll-down and other commands that
+         have the `scroll-command' property.  This avoids the
          possibility of point becoming "stuck" on a tall line when
          scrolling by one line.  */
       if (window_scroll_pixel_based_preserve_y < 0
-          || NILP (Fmemq (current_kboard->Vlast_command,
-                          Vscroll_preserve_screen_position_commands)))
+          || !SYMBOLP (current_kboard->Vlast_command)
+          || NILP (Fget (current_kboard->Vlast_command, Qscroll_command)))
         {
           start_display (&it, w, start);
           move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
@@ -5211,8 +5208,8 @@ window_scroll_line_based (window, n, whole, noerror)
   if (!NILP (Vscroll_preserve_screen_position))
     {
       if (window_scroll_preserve_vpos <= 0
-          || NILP (Fmemq (current_kboard->Vlast_command,
-                          Vscroll_preserve_screen_position_commands)))
+          || !SYMBOLP (current_kboard->Vlast_command)
+          || NILP (Fget (current_kboard->Vlast_command, Qscroll_command)))
         {
           struct position posit
             = *compute_motion (startpos, 0, 0, 0,
@@ -7180,6 +7177,12 @@ syms_of_window ()
   Qscroll_down = intern_c_string ("scroll-down");
   staticpro (&Qscroll_down);
 
+  Qscroll_command = intern_c_string ("scroll-command");
+  staticpro (&Qscroll_command);
+
+  Fput (Qscroll_up, Qscroll_command, Qt);
+  Fput (Qscroll_down, Qscroll_command, Qt);
+
   Qwindow_size_fixed = intern_c_string ("window-size-fixed");
   staticpro (&Qwindow_size_fixed);
   Fset (Qwindow_size_fixed, Qnil);
@@ -7270,18 +7273,10 @@ A value of t means point keeps its screen position if the scroll
 command moved it vertically out of the window, e.g. when scrolling
 by full screens.
 Any other value means point always keeps its screen position.
-Scroll commands are defined by the variable
-`scroll-preserve-screen-position-commands'.  */);
+Scroll commands should have the `scroll-command' property
+on their symbols to be controlled by this variable.  */);
   Vscroll_preserve_screen_position = Qnil;
 
-  DEFVAR_LISP ("scroll-preserve-screen-position-commands",
-               &Vscroll_preserve_screen_position_commands,
-               doc: /* A list of commands whose scrolling should keep screen position unchanged.
-This list defines the names of scroll commands affected by the variable
-`scroll-preserve-screen-position'.  */);
-  Vscroll_preserve_screen_position_commands =
-    Fcons (Qscroll_down, Fcons (Qscroll_up, Qnil));
-
   DEFVAR_LISP ("window-point-insertion-type", &Vwindow_point_insertion_type,
                doc: /* Type of marker to use for `window-point'.  */);
   Vwindow_point_insertion_type = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index 902651dcc44..cd8ad7bec82 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -80,7 +80,39 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    You will find a lot of redisplay optimizations when you start
    looking at the innards of redisplay.  The overall goal of all these
    optimizations is to make redisplay fast because it is done
-   frequently.
+   frequently.  Some of these optimizations are implemented by the
+   following functions:
+
+    . try_cursor_movement
+
+      This function tries to update the display if the text in the
+      window did not change and did not scroll, only point moved, and
+      it did not move off the displayed portion of the text.
+
+    . try_window_reusing_current_matrix
+
+      This function reuses the current matrix of a window when text
+      has not changed, but the window start changed (e.g., due to
+      scrolling).
+
+    . try_window_id
+
+      This function attempts to redisplay a window by reusing parts of
+      its existing display.  It finds and reuses the part that was not
+      changed, and redraws the rest.
+
+    . try_window
+
+      This function performs the full redisplay of a single window
+      assuming that its fonts were not changed and that the cursor
+      will not end up in the scroll margins.  (Loading fonts requires
+      re-adjustment of dimensions of glyph matrices, which makes this
+      method impossible to use.)
+
+   These optimizations are tried in sequence (some can be skipped if
+   it is known that they are not applicable).  If none of the
+   optimizations were successful, redisplay calls redisplay_windows,
+   which performs a full redisplay of all windows.
 
    Desired matrices.
 
@@ -112,13 +144,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    see in dispextern.h.
 
    Glyphs in a desired matrix are normally constructed in a loop
-   calling get_next_display_element and then produce_glyphs.  The call
-   to produce_glyphs will fill the iterator structure with pixel
+   calling get_next_display_element and then PRODUCE_GLYPHS.  The call
+   to PRODUCE_GLYPHS will fill the iterator structure with pixel
    information about the element being displayed and at the same time
    produce glyphs for it.  If the display element fits on the line
    being displayed, set_iterator_to_next is called next, otherwise the
-   glyphs produced are discarded.
-
+   glyphs produced are discarded.  The function display_line is the
+   workhorse of filling glyph rows in the desired matrix with glyphs.
+   In addition to producing glyphs, it also handles line truncation
+   and continuation, word wrap, and cursor positioning (for the
+   latter, see also set_cursor_from_row).
 
    Frame matrices.
 
@@ -139,7 +174,50 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    wanted to have without having to move many bytes around.  To be
    honest, there is a little bit more done, but not much more.  If you
    plan to extend that code, take a look at dispnew.c.  The function
-   build_frame_matrix is a good starting point.  */
+   build_frame_matrix is a good starting point.
+
+   Bidirectional display.
+
+   Bidirectional display adds quite some hair to this already complex
+   design.  The good news are that a large portion of that hairy stuff
+   is hidden in bidi.c behind only 3 interfaces.  bidi.c implements a
+   reordering engine which is called by set_iterator_to_next and
+   returns the next character to display in the visual order.  See
+   commentary on bidi.c for more details.  As far as redisplay is
+   concerned, the effect of calling bidi_get_next_char_visually, the
+   main interface of the reordering engine, is that the iterator gets
+   magically placed on the buffer or string position that is to be
+   displayed next.  In other words, a linear iteration through the
+   buffer/string is replaced with a non-linear one.  All the rest of
+   the redisplay is oblivious to the bidi reordering.
+
+   Well, almost oblivious---there are still complications, most of
+   them due to the fact that buffer and string positions no longer
+   change monotonously with glyph indices in a glyph row.  Moreover,
+   for continued lines, the buffer positions may not even be
+   monotonously changing with vertical positions.  Also, accounting
+   for face changes, overlays, etc. becomes more complex because
+   non-linear iteration could potentially skip many positions with
+   changes, and then cross them again on the way back...
+
+   One other prominent effect of bidirectional display is that some
+   paragraphs of text need to be displayed starting at the right
+   margin of the window---the so-called right-to-left, or R2L
+   paragraphs.  R2L paragraphs are displayed with R2L glyph rows,
+   which have their reversed_p flag set.  The bidi reordering engine
+   produces characters in such rows starting from the character which
+   should be the rightmost on display.  PRODUCE_GLYPHS then reverses
+   the order, when it fills up the glyph row whose reversed_p flag is
+   set, by prepending each new glyph to what is already there, instead
+   of appending it.  When the glyph row is complete, the function
+   extend_face_to_end_of_line fills the empty space to the left of the
+   leftmost character with special glyphs, which will display as,
+   well, empty.  On text terminals, these special glyphs are simply
+   blank characters.  On graphics terminals, there's a single stretch
+   glyph with suitably computed width.  Both the blanks and the
+   stretch glyph are given the face of the background of the line.
+   This way, the terminal-specific back-end can still draw the glyphs
+   left to right, even for R2L lines.  */
 
 #include <config.h>
 #include <stdio.h>
@@ -279,6 +357,14 @@ EMACS_INT tool_bar_button_relief;
 
 Lisp_Object Vauto_resize_tool_bars;
 
+/* Type of tool bar.  Can be symbols image, text, both or both-hroiz.  */
+
+Lisp_Object Vtool_bar_style;
+
+/* Maximum number of characters a label can have to be shown.  */
+
+EMACS_INT tool_bar_max_label_size;
+
 /* Non-zero means draw block and hollow cursor as wide as the glyph
    under it.  For example, if a block cursor is over a tab, it will be
    drawn as wide as that tab on the display.  */
@@ -326,12 +412,14 @@ extern Lisp_Object Voverflow_newline_into_fringe;
 /* Test if overflow newline into fringe.  Called with iterator IT
    at or past right window margin, and with IT->current_x set.  */
 
-#define IT_OVERFLOW_NEWLINE_INTO_FRINGE(it)     \
-  (!NILP (Voverflow_newline_into_fringe)        \
-   && FRAME_WINDOW_P (it->f)                    \
-   && WINDOW_RIGHT_FRINGE_WIDTH (it->w) > 0     \
-   && it->current_x == it->last_visible_x       \
-   && it->line_wrap != WORD_WRAP)
+#define IT_OVERFLOW_NEWLINE_INTO_FRINGE(IT)             \
+  (!NILP (Voverflow_newline_into_fringe)                \
+   && FRAME_WINDOW_P ((IT)->f)                          \
+   && ((IT)->bidi_it.paragraph_dir == R2L               \
+       ? (WINDOW_LEFT_FRINGE_WIDTH ((IT)->w) > 0)       \
+       : (WINDOW_RIGHT_FRINGE_WIDTH ((IT)->w) > 0))     \
+   && (IT)->current_x == (IT)->last_visible_x           \
+   && (IT)->line_wrap != WORD_WRAP)
 
 #else /* !HAVE_WINDOW_SYSTEM */
 #define IT_OVERFLOW_NEWLINE_INTO_FRINGE(it) 0
@@ -362,7 +450,7 @@ Lisp_Object Qescape_glyph;
 Lisp_Object Qnobreak_space;
 
 /* The symbol `image' which is the car of the lists used to represent
-   images in Lisp.  */
+   images in Lisp.  Also a tool bar style.  */
 
 Lisp_Object Qimage;
 
@@ -370,6 +458,9 @@ Lisp_Object Qimage;
 Lisp_Object QCmap, QCpointer;
 Lisp_Object Qrect, Qcircle, Qpoly;
 
+/* Tool bar styles */
+Lisp_Object Qtext, Qboth, Qboth_horiz;
+
 /* Non-zero means print newline to stdout before next mini-buffer
    message.  */
 
@@ -999,6 +1090,8 @@ static void display_tool_bar_line P_ ((struct it *, int));
 static void notice_overwritten_cursor P_ ((struct window *,
                                            enum glyph_row_area,
                                            int, int, int, int));
+static void append_stretch_glyph P_ ((struct it *, Lisp_Object,
+                                      int, int, int));
 
 
 
@@ -2358,7 +2451,7 @@ safe_call (nargs, args)
       specbind (Qinhibit_redisplay, Qt);
       /* Use Qt to ensure debugger does not run,
          so there is no possibility of wanting to redisplay.  */
-      val = internal_condition_case_2 (Ffuncall, nargs, args, Qt,
+      val = internal_condition_case_n (Ffuncall, nargs, args, Qt,
                                        safe_eval_handler);
       UNGCPRO;
       val = unbind_to (count, val);
@@ -2605,8 +2698,12 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
   /* Are multibyte characters enabled in current_buffer?  */
   it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
 
-  /* Do we need to reorder bidirectional text?  */
-  it->bidi_p = !NILP (current_buffer->bidi_display_reordering);
+  /* Do we need to reorder bidirectional text?  Not if this is a
+     unibyte buffer: by definition, none of the single-byte characters
+     are strong R2L, so no reordering is needed.  And bidi.c doesn't
+     support unibyte buffers anyway.  */
+  it->bidi_p
+    = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p;
 
   /* Non-zero if we should highlight the region.  */
   highlight_region_p
@@ -5166,6 +5263,33 @@ push_it (it)
   ++it->sp;
 }
 
+static void
+iterate_out_of_display_property (it)
+     struct it *it;
+{
+  /* Maybe initialize paragraph direction.  If we are at the beginning
+     of a new paragraph, next_element_from_buffer may not have a
+     chance to do that.  */
+  if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
+    bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+  /* prev_stop can be zero, so check against BEGV as well.  */
+  while (it->bidi_it.charpos >= BEGV
+         && it->prev_stop <= it->bidi_it.charpos
+         && it->bidi_it.charpos < CHARPOS (it->position))
+    bidi_get_next_char_visually (&it->bidi_it);
+  /* Record the stop_pos we just crossed, for when we cross it
+     back, maybe.  */
+  if (it->bidi_it.charpos > CHARPOS (it->position))
+    it->prev_stop = CHARPOS (it->position);
+  /* If we ended up not where pop_it put us, resync IT's
+     positional members with the bidi iterator. */
+  if (it->bidi_it.charpos != CHARPOS (it->position))
+    {
+      SET_TEXT_POS (it->position,
+                    it->bidi_it.charpos, it->bidi_it.bytepos);
+      it->current.pos = it->position;
+    }
+}
 
 /* Restore IT's settings from IT->stack.  Called, for example, when no
    more overlay strings must be processed, and we return to delivering
@@ -5206,6 +5330,18 @@ pop_it (it)
       break;
     case GET_FROM_BUFFER:
       it->object = it->w->buffer;
+      if (it->bidi_p)
+        {
+          /* Bidi-iterate until we get out of the portion of text, if
+             any, covered by a `display' text property or an overlay
+             with `display' property.  (We cannot just jump there,
+             because the internal coherency of the bidi iterator state
+             can not be preserved across such jumps.)  We also must
+             determine the paragraph base direction if the overlay we
+             just processed is at the beginning of a new
+             paragraph.  */
+          iterate_out_of_display_property (it);
+        }
       break;
     case GET_FROM_STRING:
       it->object = it->string;
@@ -6151,6 +6287,15 @@ set_iterator_to_next (it, reseat_p)
         {
           IT_CHARPOS (*it) += it->cmp_it.nchars;
           IT_BYTEPOS (*it) += it->cmp_it.nbytes;
+          if (it->bidi_p)
+            {
+              if (it->bidi_it.new_paragraph)
+                bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+              /* Resync the bidi iterator with IT's new position.
+                 FIXME: this doesn't support bidirectional text.  */
+              while (it->bidi_it.charpos < IT_CHARPOS (*it))
+                bidi_get_next_char_visually (&it->bidi_it);
+            }
           if (it->cmp_it.to < it->cmp_it.nglyphs)
             it->cmp_it.from = it->cmp_it.to;
           else
@@ -6631,13 +6776,20 @@ next_element_from_buffer (it)
     {
       it->bidi_it.charpos = IT_CHARPOS (*it);
       it->bidi_it.bytepos = IT_BYTEPOS (*it);
-      /* If we are at the beginning of a line, we can produce the next
-         element right away.  */
-      if (it->bidi_it.bytepos == BEGV_BYTE
+      if (it->bidi_it.bytepos == ZV_BYTE)
+        {
+          /* Nothing to do, but reset the FIRST_ELT flag, like
+             bidi_paragraph_init does, because we are not going to
+             call it.  */
+          it->bidi_it.first_elt = 0;
+        }
+      else if (it->bidi_it.bytepos == BEGV_BYTE
           /* FIXME: Should support all Unicode line separators.  */
           || FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n'
           || FETCH_CHAR (it->bidi_it.bytepos) == '\n')
         {
+          /* If we are at the beginning of a line, we can produce the
+             next element right away.  */
           bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
           bidi_get_next_char_visually (&it->bidi_it);
         }
@@ -6865,6 +7017,15 @@ next_element_from_composition (it)
         {
           IT_CHARPOS (*it) += it->cmp_it.nchars;
           IT_BYTEPOS (*it) += it->cmp_it.nbytes;
+          if (it->bidi_p)
+            {
+              if (it->bidi_it.new_paragraph)
+                bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
+              /* Resync the bidi iterator with IT's new position.
+                 FIXME: this doesn't support bidirectional text.  */
+              while (it->bidi_it.charpos < IT_CHARPOS (*it))
+                bidi_get_next_char_visually (&it->bidi_it);
+            }
           return 0;
         }
       it->position = it->current.pos;
@@ -8472,7 +8633,6 @@ message (m, a1, a2, a3)
           if (m)
             {
               int len;
-#ifdef NO_ARG_ARRAY
               char *a[3];
               a[0] = (char *) a1;
               a[1] = (char *) a2;
@@ -8480,11 +8640,6 @@ message (m, a1, a2, a3)
 
               len = doprnt (FRAME_MESSAGE_BUF (f),
                             FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
-#else
-              len = doprnt (FRAME_MESSAGE_BUF (f),
-                            FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3,
-                            (char **) &a1);
-#endif /* NO_ARG_ARRAY */
 
               message2 (FRAME_MESSAGE_BUF (f), len, 0);
             }
@@ -9837,7 +9992,8 @@ prepare_menu_bars ()
           update_tool_bar (f, 0);
 #endif
 #ifdef HAVE_NS
-          if (windows_or_buffers_changed)
+          if (windows_or_buffers_changed
+              && FRAME_NS_P (f))
             ns_set_doc_edited (f, Fbuffer_modified_p
                                (XWINDOW (f->selected_window)->buffer));
 #endif
@@ -11519,7 +11675,7 @@ static void
 select_frame_for_redisplay (frame)
      Lisp_Object frame;
 {
-  Lisp_Object tail, symbol, val;
+  Lisp_Object tail, tem;
   Lisp_Object old = selected_frame;
   struct Lisp_Symbol *sym;
 
@@ -11527,20 +11683,18 @@ select_frame_for_redisplay (frame)
 
   selected_frame = frame;
 
-  do
-    {
-      for (tail = XFRAME (frame)->param_alist; CONSP (tail); tail = XCDR (tail))
-        if (CONSP (XCAR (tail))
-            && (symbol = XCAR (XCAR (tail)),
-                SYMBOLP (symbol))
-            && (sym = indirect_variable (XSYMBOL (symbol)),
-                val = sym->value,
-                (BUFFER_LOCAL_VALUEP (val)))
-            && XBUFFER_LOCAL_VALUE (val)->check_frame)
-          /* Use find_symbol_value rather than Fsymbol_value
-             to avoid an error if it is void.  */
-          find_symbol_value (symbol);
-    } while (!EQ (frame, old) && (frame = old, 1));
+  do {
+    for (tail = XFRAME (frame)->param_alist; CONSP (tail); tail = XCDR (tail))
+      if (CONSP (XCAR (tail))
+          && (tem = XCAR (XCAR (tail)),
+              SYMBOLP (tem))
+          && (sym = indirect_variable (XSYMBOL (tem)),
+              sym->redirect == SYMBOL_LOCALIZED)
+          && sym->val.blv->frame_local)
+        /* Use find_symbol_value rather than Fsymbol_value
+           to avoid an error if it is void.  */
+        find_symbol_value (tem);
+  } while (!EQ (frame, old) && (frame = old, 1));
 }
 
 
@@ -12548,7 +12702,6 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
   /* The last known character position in row.  */
   int last_pos = MATRIX_ROW_START_CHARPOS (row) + delta;
   int x = row->x;
-  int cursor_x = x;
   EMACS_INT pt_old = PT - delta;
   EMACS_INT pos_before = MATRIX_ROW_START_CHARPOS (row) + delta;
   EMACS_INT pos_after = MATRIX_ROW_END_CHARPOS (row) + delta;
@@ -12584,8 +12737,8 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
             }
           while (end > glyph
                  && INTEGERP ((end - 1)->object)
-                 /* CHARPOS is zero for blanks inserted by
-                    extend_face_to_end_of_line.  */
+                 /* CHARPOS is zero for blanks and stretch glyphs
+                    inserted by extend_face_to_end_of_line.  */
                  && (end - 1)->charpos <= 0)
             --end;
           glyph_before = glyph - 1;
@@ -12599,9 +12752,6 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
              to front, so swap the edge pointers.  */
           glyphs_end = end = glyph - 1;
           glyph += row->used[TEXT_AREA] - 1;
-          /* Reverse the known positions in the row.  */
-          last_pos = pos_after = MATRIX_ROW_START_CHARPOS (row) + delta;
-          pos_before = MATRIX_ROW_END_CHARPOS (row) + delta;
 
           while (glyph > end + 1
                  && INTEGERP (glyph->object)
@@ -12616,7 +12766,6 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
              rightmost (first in the reading order) glyph.  */
           for (g = end + 1; g < glyph; g++)
             x += g->pixel_width;
-          cursor_x = x;
           while (end < glyph
                  && INTEGERP ((end + 1)->object)
                  && (end + 1)->charpos <= 0)
@@ -12631,7 +12780,14 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
          rightmost glyph.  Case in point: an empty last line that is
          part of an R2L paragraph.  */
       cursor = end - 1;
-      x = -1;   /* will be computed below, at lable compute_x */
+      /* Avoid placing the cursor on the last glyph of the row, where
+         on terminal frames we hold the vertical border between
+         adjacent windows.  */
+      if (!FRAME_WINDOW_P (WINDOW_XFRAME (w))
+          && !WINDOW_RIGHTMOST_P (w)
+          && cursor == row->glyphs[LAST_AREA] - 1)
+        cursor--;
+      x = -1;   /* will be computed below, at label compute_x */
     }
 
   /* Step 1: Try to find the glyph whose character position
@@ -12767,8 +12923,11 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
             string_seen = 1;
           }
         --glyph;
-        if (glyph == end)
-          break;
+        if (glyph == glyphs_end) /* don't dereference outside TEXT_AREA */
+          {
+            x--;                /* can't use any pixel_width */
+            break;
+          }
         x -= glyph->pixel_width;
     }
 
@@ -12808,7 +12967,10 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
         }
       else if (match_with_avoid_cursor
                /* zero-width characters produce no glyphs */
-               || eabs (glyph_after - glyph_before) == 1)
+               || ((row->reversed_p
+                    ? glyph_after > glyphs_end
+                    : glyph_after < glyphs_end)
+                   && eabs (glyph_after - glyph_before) == 1))
         {
           cursor = glyph_after;
           x = -1;
@@ -12864,7 +13026,8 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
 
                           cursor = glyph;
                           for (glyph += incr;
-                               EQ (glyph->object, str);
+                               (row->reversed_p ? glyph > stop : glyph < stop)
+                                 && EQ (glyph->object, str);
                                glyph += incr)
                             {
                               Lisp_Object cprop;
@@ -12904,8 +13067,9 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
 
           /* If we reached the end of the line, and END was from a string,
              the cursor is not on this line.  */
-          if (glyph == end
-              && STRINGP ((glyph - incr)->object)
+          if (cursor == NULL
+              && (row->reversed_p ? glyph <= end : glyph >= end)
+              && STRINGP (end->object)
               && row->continued_p)
             return 0;
         }
@@ -12927,11 +13091,17 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
         }
     }
 
-  /* ROW could be part of a continued line, which might have other
-     rows whose start and end charpos occlude point.  Only set
-     w->cursor if we found a better approximation to the cursor
-     position than we have from previously examined rows.  */
-  if (w->cursor.vpos >= 0
+  /* ROW could be part of a continued line, which, under bidi
+     reordering, might have other rows whose start and end charpos
+     occlude point.  Only set w->cursor if we found a better
+     approximation to the cursor position than we have from previously
+     examined candidate rows belonging to the same continued line.  */
+  if (/* we already have a candidate row */
+      w->cursor.vpos >= 0
+      /* that candidate is not the row we are processing */
+      && MATRIX_ROW (matrix, w->cursor.vpos) != row
+      /* the row we are processing is part of a continued line */
+      && (row->continued_p || MATRIX_ROW_CONTINUATION_LINE_P (row))
       /* Make sure cursor.vpos specifies a row whose start and end
          charpos occlude point.  This is because some callers of this
          function leave cursor.vpos at the row where the cursor was
@@ -13557,11 +13727,14 @@ try_cursor_movement (window, startp, scroll_step)
                   ++row;
                 }
 
-              /* The end position of a row equals the start position
-                 of the next row.  If PT is there, we would rather
-                 display it in the next line.  */
+              /* If the end position of a row equals the start
+                 position of the next row, and PT is at that position,
+                 we would rather display cursor in the next line.  */
               while (MATRIX_ROW_BOTTOM_Y (row) < last_y
                      && MATRIX_ROW_END_CHARPOS (row) == PT
+                     && row < w->current_matrix->rows
+                                + w->current_matrix->nrows - 1
+                     && MATRIX_ROW_START_CHARPOS (row+1) == PT
                      && !cursor_row_p (w, row))
                 ++row;
 
@@ -16580,24 +16753,61 @@ insert_left_trunc_glyphs (it)
   produce_special_glyphs (&truncate_it, IT_TRUNCATION);
 
   /* Overwrite glyphs from IT with truncation glyphs.  */
-  from = truncate_it.glyph_row->glyphs[TEXT_AREA];
-  end = from + truncate_it.glyph_row->used[TEXT_AREA];
-  to = it->glyph_row->glyphs[TEXT_AREA];
-  toend = to + it->glyph_row->used[TEXT_AREA];
-
-  while (from < end)
-    *to++ = *from++;
-
-  /* There may be padding glyphs left over.  Overwrite them too.  */
-  while (to < toend && CHAR_GLYPH_PADDING_P (*to))
+  if (!it->glyph_row->reversed_p)
     {
       from = truncate_it.glyph_row->glyphs[TEXT_AREA];
+      end = from + truncate_it.glyph_row->used[TEXT_AREA];
+      to = it->glyph_row->glyphs[TEXT_AREA];
+      toend = to + it->glyph_row->used[TEXT_AREA];
+
       while (from < end)
         *to++ = *from++;
+
+      /* There may be padding glyphs left over.  Overwrite them too.  */
+      while (to < toend && CHAR_GLYPH_PADDING_P (*to))
+        {
+          from = truncate_it.glyph_row->glyphs[TEXT_AREA];
+          while (from < end)
+            *to++ = *from++;
+        }
+
+      if (to > toend)
+        it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA];
     }
+  else
+    {
+      /* In R2L rows, overwrite the last (rightmost) glyphs, and do
+         that back to front.  */
+      end = truncate_it.glyph_row->glyphs[TEXT_AREA];
+      from = end + truncate_it.glyph_row->used[TEXT_AREA] - 1;
+      toend = it->glyph_row->glyphs[TEXT_AREA];
+      to = toend + it->glyph_row->used[TEXT_AREA] - 1;
+
+      while (from >= end && to >= toend)
+        *to-- = *from--;
+      while (to >= toend && CHAR_GLYPH_PADDING_P (*to))
+        {
+          from =
+            truncate_it.glyph_row->glyphs[TEXT_AREA]
+            + truncate_it.glyph_row->used[TEXT_AREA] - 1;
+          while (from >= end && to >= toend)
+            *to-- = *from--;
+        }
+      if (from >= end)
+        {
+          /* Need to free some room before prepending additional
+             glyphs.  */
+          int move_by = from - end + 1;
+          struct glyph *g0 = it->glyph_row->glyphs[TEXT_AREA];
+          struct glyph *g = g0 + it->glyph_row->used[TEXT_AREA] - 1;
 
-  if (to > toend)
-    it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA];
+          for ( ; g >= g0; g--)
+            g[move_by] = *g;
+          while (from >= end)
+            *to-- = *from--;
+          it->glyph_row->used[TEXT_AREA] += move_by;
+        }
+    }
 }
 
 
@@ -16774,9 +16984,11 @@ append_space_for_newline (it, default_face_p)
 
 
 /* Extend the face of the last glyph in the text area of IT->glyph_row
-   to the end of the display line.  Called from display_line.
-   If the glyph row is empty, add a space glyph to it so that we
-   know the face to draw.  Set the glyph row flag fill_line_p.  */
+   to the end of the display line.  Called from display_line.  If the
+   glyph row is empty, add a space glyph to it so that we know the
+   face to draw.  Set the glyph row flag fill_line_p.  If the glyph
+   row is R2L, prepend a stretch glyph to cover the empty space to the
+   left of the leftmost glyph.  */
 
 static void
 extend_face_to_end_of_line (it)
@@ -16785,15 +16997,22 @@ extend_face_to_end_of_line (it)
   struct face *face;
   struct frame *f = it->f;
 
-  /* If line is already filled, do nothing.  */
-  if (it->current_x >= it->last_visible_x)
+  /* If line is already filled, do nothing.  Non window-system frames
+     get a grace of one more ``pixel'' because their characters are
+     1-``pixel'' wide, so they hit the equality too early.  This grace
+     is needed only for R2L rows that are not continued, to produce
+     one extra blank where we could display the cursor.  */
+  if (it->current_x >= it->last_visible_x
+      + (!FRAME_WINDOW_P (f)
+         && it->glyph_row->reversed_p
+         && !it->glyph_row->continued_p))
     return;
 
   /* Face extension extends the background and box of IT->face_id
      to the end of the line.  If the background equals the background
      of the frame, we don't have to do anything.  */
   if (it->face_before_selective_p)
-    face = FACE_FROM_ID (it->f, it->saved_face_id);
+    face = FACE_FROM_ID (f, it->saved_face_id);
   else
     face = FACE_FROM_ID (f, it->face_id);
 
@@ -16801,7 +17020,8 @@ extend_face_to_end_of_line (it)
       && it->glyph_row->displays_text_p
       && face->box == FACE_NO_BOX
       && face->background == FRAME_BACKGROUND_PIXEL (f)
-      && !face->stipple)
+      && !face->stipple
+      && !it->glyph_row->reversed_p)
     return;
 
   /* Set the glyph row flag indicating that the face of the last glyph
@@ -16828,6 +17048,50 @@ extend_face_to_end_of_line (it)
           it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id;
           it->glyph_row->used[TEXT_AREA] = 1;
         }
+#ifdef HAVE_WINDOW_SYSTEM
+      if (it->glyph_row->reversed_p)
+        {
+          /* Prepend a stretch glyph to the row, such that the
+             rightmost glyph will be drawn flushed all the way to the
+             right margin of the window.  The stretch glyph that will
+             occupy the empty space, if any, to the left of the
+             glyphs.  */
+          struct font *font = face->font ? face->font : FRAME_FONT (f);
+          struct glyph *row_start = it->glyph_row->glyphs[TEXT_AREA];
+          struct glyph *row_end = row_start + it->glyph_row->used[TEXT_AREA];
+          struct glyph *g;
+          int row_width, stretch_ascent, stretch_width;
+          struct text_pos saved_pos;
+          int saved_face_id, saved_avoid_cursor;
+
+          for (row_width = 0, g = row_start; g < row_end; g++)
+            row_width += g->pixel_width;
+          stretch_width = window_box_width (it->w, TEXT_AREA) - row_width;
+          if (stretch_width > 0)
+            {
+              stretch_ascent =
+                (((it->ascent + it->descent)
+                  * FONT_BASE (font)) / FONT_HEIGHT (font));
+              saved_pos = it->position;
+              bzero (&it->position, sizeof it->position);
+              saved_avoid_cursor = it->avoid_cursor_p;
+              it->avoid_cursor_p = 1;
+              saved_face_id = it->face_id;
+              /* The last row's stretch glyph should get the default
+                 face, to avoid painting the rest of the window with
+                 the region face, if the region ends at ZV.  */
+              if (it->glyph_row->ends_at_zv_p)
+                it->face_id = DEFAULT_FACE_ID;
+              else
+                it->face_id = face->id;
+              append_stretch_glyph (it, make_number (0), stretch_width,
+                                    it->ascent + it->descent, stretch_ascent);
+              it->position = saved_pos;
+              it->avoid_cursor_p = saved_avoid_cursor;
+              it->face_id = saved_face_id;
+            }
+        }
+#endif  /* HAVE_WINDOW_SYSTEM */
     }
   else
     {
@@ -16846,7 +17110,13 @@ extend_face_to_end_of_line (it)
       it->object = make_number (0);
       it->c = ' ';
       it->len = 1;
-      it->face_id = face->id;
+      /* The last row's blank glyphs should get the default face, to
+         avoid painting the rest of the window with the region face,
+         if the region ends at ZV.  */
+      if (it->glyph_row->ends_at_zv_p)
+        it->face_id = DEFAULT_FACE_ID;
+      else
+        it->face_id = face->id;
 
       PRODUCE_GLYPHS (it);
 
@@ -17132,6 +17402,148 @@ handle_line_prefix (struct it *it)
 
 
 
+/* Remove N glyphs at the start of a reversed IT->glyph_row.  Called
+   only for R2L lines from display_line, when it decides that too many
+   glyphs were produced by PRODUCE_GLYPHS, and the line needs to be
+   continued.  */
+static void
+unproduce_glyphs (it, n)
+     struct it *it;
+     int n;
+{
+  struct glyph *glyph, *end;
+
+  xassert (it->glyph_row);
+  xassert (it->glyph_row->reversed_p);
+  xassert (it->area == TEXT_AREA);
+  xassert (n <= it->glyph_row->used[TEXT_AREA]);
+
+  if (n > it->glyph_row->used[TEXT_AREA])
+    n = it->glyph_row->used[TEXT_AREA];
+  glyph = it->glyph_row->glyphs[TEXT_AREA] + n;
+  end = it->glyph_row->glyphs[TEXT_AREA] + it->glyph_row->used[TEXT_AREA];
+  for ( ; glyph < end; glyph++)
+    glyph[-n] = *glyph;
+}
+
+/* Find the positions in a bidi-reordered ROW to serve as ROW->start
+   and ROW->end.  */
+static struct display_pos
+find_row_end (it, row)
+     struct it *it;
+     struct glyph_row *row;
+{
+  /* FIXME: Revisit this when glyph ``spilling'' in continuation
+     lines' rows is implemented for bidi-reordered rows.  */
+  EMACS_INT min_pos = ZV + 1, max_pos = 0;
+  struct glyph *g;
+  struct it save_it;
+  struct text_pos tpos;
+  struct display_pos row_end = it->current;
+
+  for (g = row->glyphs[TEXT_AREA];
+       g < row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
+       g++)
+    {
+      if (BUFFERP (g->object))
+        {
+          if (g->charpos > 0 && g->charpos < min_pos)
+            min_pos = g->charpos;
+          if (g->charpos > max_pos)
+            max_pos = g->charpos;
+        }
+    }
+  /* Empty lines have a valid buffer position at their first
+     glyph, but that glyph's OBJECT is zero, as if it didn't come
+     from a buffer.  If we didn't find any valid buffer positions
+     in this row, maybe we have such an empty line.  */
+  if (max_pos == 0 && row->used[TEXT_AREA])
+    {
+      for (g = row->glyphs[TEXT_AREA];
+           g < row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
+           g++)
+        {
+          if (INTEGERP (g->object))
+            {
+              if (g->charpos > 0 && g->charpos < min_pos)
+                min_pos = g->charpos;
+              if (g->charpos > max_pos)
+                max_pos = g->charpos;
+            }
+        }
+    }
+
+  /* ROW->start is the value of min_pos, the minimal buffer position
+     we have in ROW.  */
+  if (min_pos <= ZV)
+    {
+      /* Avoid calling the costly CHAR_TO_BYTE if possible.  */
+      if (min_pos != row->start.pos.charpos)
+        SET_TEXT_POS (row->start.pos, min_pos, CHAR_TO_BYTE (min_pos));
+      if (max_pos == 0)
+        max_pos = min_pos;
+    }
+
+  /* For ROW->end, we need the position that is _after_ max_pos, in
+     the logical order, unless we are at ZV.  */
+  if (row->ends_at_zv_p)
+    {
+      if (!row->used[TEXT_AREA])
+        row->start.pos = row_end.pos;
+    }
+  else if (row->used[TEXT_AREA] && max_pos)
+    {
+      int at_eol_p;
+
+      SET_TEXT_POS (tpos, max_pos, CHAR_TO_BYTE (max_pos));
+      save_it = *it;
+      it->bidi_p = 0;
+      reseat (it, tpos, 0);
+      if (!get_next_display_element (it))
+        abort ();       /* this row cannot be at ZV, see above */
+      at_eol_p = ITERATOR_AT_END_OF_LINE_P (it);
+      set_iterator_to_next (it, 1);
+      row_end = it->current;
+      /* If the character at max_pos is not a newline and the
+         characters at max_pos+1 is a newline, skip that newline as
+         well.  Note that this may skip some invisible text.  */
+      if (!at_eol_p
+          && get_next_display_element (it)
+          && ITERATOR_AT_END_OF_LINE_P (it))
+        {
+          set_iterator_to_next (it, 1);
+          /* Record the position after the newline of a continued row.
+             We will need that to set ROW->end of the last row
+             produced for a continued line.  */
+          if (row->continued_p)
+            save_it.eol_pos = it->current.pos;
+          else
+            {
+              row_end = it->current;
+              save_it.eol_pos.charpos = save_it.eol_pos.bytepos = 0;
+            }
+        }
+      else if (!row->continued_p
+               && MATRIX_ROW_CONTINUATION_LINE_P (row)
+               && it->eol_pos.charpos > 0)
+        {
+          /* Last row of a continued line.  Use the position recorded
+             in IT->eol_pos, to the effect that the newline belongs to
+             this row, not to the row which displays the character
+             with the largest buffer position before the newline.  */
+          row_end.pos = it->eol_pos;
+          it->eol_pos.charpos = it->eol_pos.bytepos = 0;
+        }
+      *it = save_it;
+      /* The members of ROW->end that are not taken from buffer
+         positions are copied from IT->current.  */
+      row_end.string_pos = it->current.string_pos;
+      row_end.overlay_string_index = it->current.overlay_string_index;
+      row_end.dpvec_index = it->current.dpvec_index;
+    }
+  return row_end;
+}
+
 /* Construct the glyph row IT->glyph_row in the desired matrix of
    IT->w from text at the current position of IT.  See dispextern.h
    for an overview of struct it.  Value is non-zero if
@@ -17149,7 +17561,6 @@ display_line (it)
   int wrap_row_used = -1, wrap_row_ascent, wrap_row_height;
   int wrap_row_phys_ascent, wrap_row_phys_height;
   int wrap_row_extra_line_spacing;
-  struct display_pos row_end;
   int cvpos;
 
   /* We always start displaying at hpos zero even if hscrolled.  */
@@ -17396,6 +17807,9 @@ display_line (it)
                       /* A padding glyph that doesn't fit on this line.
                          This means the whole character doesn't fit
                          on the line.  */
+                      if (row->reversed_p)
+                        unproduce_glyphs (it, row->used[TEXT_AREA]
+                                               - n_glyphs_before);
                       row->used[TEXT_AREA] = n_glyphs_before;
 
                       /* Fill the rest of the row with continuation
@@ -17418,6 +17832,9 @@ display_line (it)
                   else if (wrap_row_used > 0)
                     {
                     back_to_wrap:
+                      if (row->reversed_p)
+                        unproduce_glyphs (it,
+                                          row->used[TEXT_AREA] - wrap_row_used);
                       *it = wrap_it;
                       it->continuation_lines_width += wrap_x;
                       row->used[TEXT_AREA] = wrap_row_used;
@@ -17453,6 +17870,9 @@ display_line (it)
                       /* Something other than a TAB that draws past
                          the right edge of the window.  Restore
                          positions to values before the element.  */
+                      if (row->reversed_p)
+                        unproduce_glyphs (it, row->used[TEXT_AREA]
+                                               - (n_glyphs_before + i));
                       row->used[TEXT_AREA] = n_glyphs_before + i;
 
                       /* Display continuation glyphs.  */
@@ -17558,9 +17978,26 @@ display_line (it)
             {
               int i, n;
 
-              for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
-                if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
-                  break;
+              if (!row->reversed_p)
+                {
+                  for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
+                    if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
+                      break;
+                }
+              else
+                {
+                  for (i = 0; i < row->used[TEXT_AREA]; i++)
+                    if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
+                      break;
+                  /* Remove any padding glyphs at the front of ROW, to
+                     make room for the truncation glyphs we will be
+                     adding below.  The loop below always inserts at
+                     least one truncation glyph, so also remove the
+                     last glyph added to ROW.  */
+                  unproduce_glyphs (it, i + 1);
+                  /* Adjust i for the loop below.  */
+                  i = row->used[TEXT_AREA] - (i + 1);
+                }
 
               for (n = row->used[TEXT_AREA]; i < n; ++i)
                 {
@@ -17651,116 +18088,13 @@ display_line (it)
   compute_line_metrics (it);
 
   /* Remember the position at which this line ends.  */
-  row->end = row_end = it->current;
+  row->end = it->current;
+  /* ROW->start and ROW->end must be the smallest and the largest
+     buffer positions in ROW.  But if ROW was bidi-reordered, these
+     two positions can be anywhere in the row, so we must rescan all
+     of the ROW's glyphs to find them.  */
   if (it->bidi_p)
-    {
-      /* ROW->start and ROW->end must be the smallest and largest
-         buffer positions in ROW.  But if ROW was bidi-reordered,
-         these two positions can be anywhere in the row, so we must
-         rescan all of the ROW's glyphs to find them.  */
-      /* FIXME: Revisit this when glyph ``spilling'' in continuation
-         lines' rows is implemented for bidi-reordered rows.  */
-      EMACS_INT min_pos = ZV + 1, max_pos = 0;
-      struct glyph *g;
-      struct it save_it;
-      struct text_pos tpos;
-
-      for (g = row->glyphs[TEXT_AREA];
-           g < row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
-           g++)
-        {
-          if (BUFFERP (g->object))
-            {
-              if (g->charpos > 0 && g->charpos < min_pos)
-                min_pos = g->charpos;
-              if (g->charpos > max_pos)
-                max_pos = g->charpos;
-            }
-        }
-      /* Empty lines have a valid buffer position at their first
-         glyph, but that glyph's OBJECT is zero, as if it didn't come
-         from a buffer.  If we didn't find any valid buffer positions
-         in this row, maybe we have such an empty line.  */
-      if (min_pos == ZV + 1 && row->used[TEXT_AREA])
-        {
-          for (g = row->glyphs[TEXT_AREA];
-               g < row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
-               g++)
-            {
-              if (INTEGERP (g->object))
-                {
-                  if (g->charpos > 0 && g->charpos < min_pos)
-                    min_pos = g->charpos;
-                  if (g->charpos > max_pos)
-                    max_pos = g->charpos;
-                }
-            }
-        }
-      if (min_pos <= ZV)
-        {
-          if (min_pos != row->start.pos.charpos)
-            {
-              row->start.pos.charpos = min_pos;
-              row->start.pos.bytepos = CHAR_TO_BYTE (min_pos);
-            }
-          if (max_pos == 0)
-            max_pos = min_pos;
-        }
-      /* For ROW->end, we need the position that is _after_ max_pos,
-         in the logical order, unless we are at ZV.  */
-      if (row->ends_at_zv_p)
-        {
-          row_end = row->end = it->current;
-          if (!row->used[TEXT_AREA])
-            {
-              row->start.pos.charpos = row_end.pos.charpos;
-              row->start.pos.bytepos = row_end.pos.bytepos;
-            }
-        }
-      else if (row->used[TEXT_AREA] && max_pos)
-        {
-          SET_TEXT_POS (tpos, max_pos + 1, CHAR_TO_BYTE (max_pos + 1));
-          row_end = it->current;
-          row_end.pos = tpos;
-          /* If the character at max_pos+1 is a newline, skip that as
-             well.  Note that this may skip some invisible text.  */
-          if (FETCH_CHAR (tpos.bytepos) == '\n'
-              || (FETCH_CHAR (tpos.bytepos) == '\r' && it->selective))
-            {
-              save_it = *it;
-              it->bidi_p = 0;
-              reseat_1 (it, tpos, 0);
-              set_iterator_to_next (it, 1);
-              /* Record the position after the newline of a continued
-                 row.  We will need that to set ROW->end of the last
-                 row produced for a continued line.  */
-              if (row->continued_p)
-                {
-                  save_it.eol_pos.charpos = IT_CHARPOS (*it);
-                  save_it.eol_pos.bytepos = IT_BYTEPOS (*it);
-                }
-              else
-                {
-                  row_end = it->current;
-                  save_it.eol_pos.charpos = save_it.eol_pos.bytepos = 0;
-                }
-              *it = save_it;
-            }
-          else if (!row->continued_p
-                   && row->continuation_lines_width
-                   && it->eol_pos.charpos > 0)
-            {
-              /* Last row of a continued line.  Use the position
-                 recorded in ROW->eol_pos, to the effect that the
-                 newline belongs to this row, not to the row which
-                 displays the character with the largest buffer
-                 position.  */
-              row_end.pos = it->eol_pos;
-              it->eol_pos.charpos = it->eol_pos.bytepos = 0;
-            }
-          row->end = row_end;
-        }
-    }
+    row->end = find_row_end (it, row);
 
   /* Record whether this row ends inside an ellipsis.  */
   row->ends_in_ellipsis_p
@@ -17808,11 +18142,13 @@ display_line (it)
   it->current_y += row->height;
   ++it->vpos;
   ++it->glyph_row;
-  /* The next row should use same value of the reversed_p flag as this
-     one.  set_iterator_to_next decides when it's a new paragraph, and
-     PRODUCE_GLYPHS recomputes the value of the flag accordingly.  */
-  it->glyph_row->reversed_p = row->reversed_p;
-  it->start = row_end;
+  /* The next row should by default use the same value of the
+     reversed_p flag as this one.  set_iterator_to_next decides when
+     it's a new paragraph, and PRODUCE_GLYPHS recomputes the value of
+     the flag accordingly.  */
+  if (it->glyph_row < MATRIX_BOTTOM_TEXT_ROW (it->w->desired_matrix, it->w))
+    it->glyph_row->reversed_p = row->reversed_p;
+  it->start = row->end;
   return row->displays_text_p;
 }
 
@@ -21415,6 +21751,17 @@ append_composite_glyph (it)
   glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area];
   if (glyph < it->glyph_row->glyphs[area + 1])
     {
+      /* If the glyph row is reversed, we need to prepend the glyph
+         rather than append it.  */
+      if (it->glyph_row->reversed_p && it->area == TEXT_AREA)
+        {
+          struct glyph *g;
+
+          /* Make room for the new glyph.  */
+          for (g = glyph - 1; g >= it->glyph_row->glyphs[it->area]; g--)
+            g[1] = *g;
+          glyph = it->glyph_row->glyphs[it->area];
+        }
       glyph->charpos = CHARPOS (it->position);
       glyph->object = it->object;
       glyph->pixel_width = it->pixel_width;
@@ -21660,6 +22007,17 @@ append_stretch_glyph (it, object, width, height, ascent)
   glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area];
   if (glyph < it->glyph_row->glyphs[area + 1])
     {
+      /* If the glyph row is reversed, we need to prepend the glyph
+         rather than append it.  */
+      if (it->glyph_row->reversed_p && area == TEXT_AREA)
+        {
+          struct glyph *g;
+
+          /* Make room for the additional glyph.  */
+          for (g = glyph - 1; g >= it->glyph_row->glyphs[area]; g--)
+            g[1] = *g;
+          glyph = it->glyph_row->glyphs[area];
+        }
       glyph->charpos = CHARPOS (it->position);
       glyph->object = object;
       glyph->pixel_width = width;
@@ -21686,6 +22044,11 @@ append_stretch_glyph (it, object, width, height, ascent)
             abort ();
           glyph->bidi_type = it->bidi_it.type;
         }
+      else
+        {
+          glyph->resolved_level = 0;
+          glyph->bidi_type = UNKNOWN_BT;
+        }
       ++it->glyph_row->used[area];
     }
   else
@@ -23166,7 +23529,7 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1)
   if (row->cursor_in_fringe_p)
     {
       row->cursor_in_fringe_p = 0;
-      draw_fringe_bitmap (w, row, 0);
+      draw_fringe_bitmap (w, row, row->reversed_p);
       w->phys_cursor_on_p = 0;
       return;
     }
@@ -23267,7 +23630,9 @@ draw_phys_cursor_glyph (w, row, hl)
   /* If cursor hpos is out of bounds, don't draw garbage.  This can
      happen in mini-buffer windows when switching between echo area
      glyphs and mini-buffer.  */
-  if (w->phys_cursor.hpos < row->used[TEXT_AREA])
+  if ((row->reversed_p
+       ? (w->phys_cursor.hpos >= 0)
+       : (w->phys_cursor.hpos < row->used[TEXT_AREA])))
     {
       int on_p = w->phys_cursor_on_p;
       int x1;
@@ -23347,7 +23712,7 @@ erase_phys_cursor (w)
   if (cursor_row->cursor_in_fringe_p)
     {
       cursor_row->cursor_in_fringe_p = 0;
-      draw_fringe_bitmap (w, cursor_row, 0);
+      draw_fringe_bitmap (w, cursor_row, cursor_row->reversed_p);
       goto mark_cursor_off;
     }
 
@@ -23356,7 +23721,9 @@ erase_phys_cursor (w)
      should have cleared the cursor.  Note that we wouldn't be
      able to erase the cursor in this case because we don't have a
      cursor glyph at hand.  */
-  if (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA])
+  if ((cursor_row->reversed_p
+       ? (w->phys_cursor.hpos < 0)
+       : (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA])))
     goto mark_cursor_off;
 
   /* If the cursor is in the mouse face area, redisplay that when
@@ -23372,7 +23739,7 @@ erase_phys_cursor (w)
       /* Don't redraw the cursor's spot in mouse face if it is at the
          end of a line (on a newline).  The cursor appears there, but
          mouse highlighting does not.  */
-      && cursor_row->used[TEXT_AREA] > hpos)
+      && cursor_row->used[TEXT_AREA] > hpos && hpos >= 0)
     mouse_face_here_p = 1;
 
   /* Maybe clear the display under the cursor.  */
@@ -23454,7 +23821,7 @@ display_and_set_cursor (w, on, hpos, vpos, x, y)
 
   glyph = NULL;
   if (!glyph_row->exact_window_width_line_p
-      || hpos < glyph_row->used[TEXT_AREA])
+      || (0 <= hpos && hpos < glyph_row->used[TEXT_AREA]))
     glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
 
   xassert (interrupt_input_blocked);
@@ -25557,6 +25924,12 @@ syms_of_xdisp ()
   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);
   QCmap = intern_c_string (":map");
   staticpro (&QCmap);
   QCpointer = intern_c_string (":pointer");
@@ -25897,6 +26270,22 @@ vertical margin.  */);
     doc: /* *Relief thickness of tool-bar buttons.  */);
   tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF;
 
+  DEFVAR_LISP ("tool-bar-style", &Vtool_bar_style,
+    doc: /* *Tool bar style to use.
+It can be one of
+ image      - show images only
+ text       - show text only
+ both       - show both, text under image
+ both-horiz - show text to the right of the image
+ any other  - use system default or image if no system default.  */);
+  Vtool_bar_style = Qnil;
+
+  DEFVAR_INT ("tool-bar-max-label-size", &tool_bar_max_label_size,
+    doc: /* *Maximum number of characters a label can have to be shown.
+The tool bar style must also show labels for this to have any effect, see
+`tool-bar-style'.  */);
+  tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE;
+
   DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
     doc: /* List of functions to call to fontify regions of text.
 Each function is called with one argument POS.  Functions must
diff --git a/src/xmenu.c b/src/xmenu.c
index c8067a47deb..796dd3093e8 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -978,14 +978,9 @@ apply_systemfont_to_menu (w)
   if (XtIsShell (w)) /* popup menu */
     {
       Widget *childs = NULL;
-      int num = 0;
 
-      XtVaGetValues (w, XtNnumChildren, &num, NULL);
-      if (num != 1) return; /* Should only be one. */
-
-      childs[0] = 0;
       XtVaGetValues (w, XtNchildren, &childs, NULL);
-      if (childs && *childs) w = *childs;
+      if (*childs) w = *childs;
     }
 
   /* Only use system font if the default is used for the menu.  */
diff --git a/src/xrdb.c b/src/xrdb.c
index 7808bacc59f..bd3474c0466 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -34,24 +34,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <setjmp.h>
 
-#if 1 /* I'd really appreciate it if this code could go away...  -JimB */
-/* This avoids lossage in the `dual-universe' headers on AT&T SysV
-   X11.  Don't do it on Solaris, because it breaks compilation with
-   XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris
-   2 */
-#if defined(USG5) && !defined(SOLARIS2)
-#ifndef SYSV
-#define SYSV
-#endif
-#endif /* USG5 && !SOLARIS2 */
-
-#endif /* 1 */
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
-#if 0
-#include <X11/Xos.h>
-#endif
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
diff --git a/src/xsettings.c b/src/xsettings.c
index 1db7a24ebad..f1b4c8c9b23 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -1,4 +1,4 @@
-/* Functions for handle font changes dynamically.
+/* Functions for handle font and other changes dynamically.
    Copyright (C) 2009, 2010
                  Free Software Foundation, Inc.
 
@@ -18,6 +18,7 @@ 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 "config.h"
+#include <limits.h>
 #include <setjmp.h>
 #include <fcntl.h>
 #include "lisp.h"
@@ -41,10 +42,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static char *current_mono_font;
 static char *current_font;
 static struct x_display_info *first_dpyinfo;
-static Lisp_Object Qfont_name, Qfont_render;
+static Lisp_Object Qmonospace_font_name, Qfont_name, Qfont_render,
+  Qtool_bar_style;
 static int use_system_font;
 static Lisp_Object Vxft_settings;
-
+static Lisp_Object current_tool_bar_style;
 
 #ifdef HAVE_GCONF
 static GConfClient *gconf_client;
@@ -52,7 +54,7 @@ static GConfClient *gconf_client;
 
 
 static void
-store_font_changed_event (arg, display_name)
+store_config_changed_event (arg, display_name)
      Lisp_Object arg;
      Lisp_Object display_name;
 {
@@ -64,7 +66,32 @@ store_font_changed_event (arg, display_name)
   kbd_buffer_store_event (&event);
 }
 
-#define XSETTINGS_FONT_NAME  "Gtk/FontName"
+#define XSETTINGS_FONT_NAME       "Gtk/FontName"
+#define XSETTINGS_TOOL_BAR_STYLE  "Gtk/ToolbarStyle"
+
+enum {
+  SEEN_AA         = 0x01,
+  SEEN_HINTING    = 0x02,
+  SEEN_RGBA       = 0x04,
+  SEEN_LCDFILTER  = 0x08,
+  SEEN_HINTSTYLE  = 0x10,
+  SEEN_DPI        = 0x20,
+  SEEN_FONT       = 0x40,
+  SEEN_TB_STYLE   = 0x80,
+};
+struct xsettings 
+{
+#ifdef HAVE_XFT
+  FcBool aa, hinting;
+  int rgba, lcdfilter, hintstyle;
+  double dpi;
+#endif
+
+  char *font;
+  char *tb_style;
+
+  unsigned seen;
+};
 
 #ifdef HAVE_GCONF
 
@@ -105,8 +132,8 @@ something_changedCB (client, cnxn_id, entry, user_data)
         found = dpyinfo == first_dpyinfo;
 
       if (found && use_system_font)
-        store_font_changed_event (Qfont_name,
-                                  XCAR (first_dpyinfo->name_list_element));
+        store_config_changed_event (Qmonospace_font_name,
+                                    XCAR (first_dpyinfo->name_list_element));
     }
 }
 #endif /* HAVE_GCONF */
@@ -124,6 +151,8 @@ something_changedCB (client, cnxn_id, entry, user_data)
 #define FC_LCD_FILTER "lcdfilter"
 #endif
 
+#endif /* HAVE_XFT */
+
 /* Find the window that contains the XSETTINGS property values.  */
 
 static void
@@ -144,23 +173,6 @@ get_prop_window (dpyinfo)
   XUngrabServer (dpy);
 }
 
-enum {
-  SEEN_AA         = 0x01,
-  SEEN_HINTING    = 0x02,
-  SEEN_RGBA       = 0x04,
-  SEEN_LCDFILTER  = 0x08,
-  SEEN_HINTSTYLE  = 0x10,
-  SEEN_DPI        = 0x20,
-};
-struct xsettings 
-{
-  FcBool aa, hinting;
-  int rgba, lcdfilter, hintstyle;
-  double dpi;
-
-  unsigned seen;
-};
-
 #define SWAP32(nr) (((nr) << 24) | (((nr) << 8) & 0xff0000)     \
                     | (((nr) >> 8) & 0xff00) | ((nr) >> 24))
 #define SWAP16(nr) (((nr) << 8) | ((nr) >> 8))
@@ -217,7 +229,7 @@ struct xsettings
 */
 
 static int
-parse_xft_settings (prop, bytes, settings)
+parse_settings (prop, bytes, settings)
      unsigned char *prop;
      unsigned long bytes;
      struct xsettings *settings;
@@ -268,8 +280,13 @@ parse_xft_settings (prop, bytes, settings)
       bytes_parsed += 4; /* Skip serial for this value */
       if (bytes_parsed > bytes) return BadLength;
 
-      want_this = (nlen > 6 && strncmp (name, "Xft/", 4) == 0)
-        || (strcmp (XSETTINGS_FONT_NAME, name) == 0);
+      want_this =
+#ifdef HAVE_XFT
+        (nlen > 6 && strncmp (name, "Xft/", 4) == 0)
+        ||
+#endif
+        (strcmp (XSETTINGS_FONT_NAME, name) == 0)
+        || (strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0);
 
       switch (type) 
         {
@@ -311,7 +328,18 @@ parse_xft_settings (prop, bytes, settings)
       if (want_this) 
         {
           ++settings_seen;
-          if (strcmp (name, "Xft/Antialias") == 0)
+          if (strcmp (name, XSETTINGS_FONT_NAME) == 0)
+            {
+              settings->font = xstrdup (sval);
+              settings->seen |= SEEN_FONT;
+            }
+          else 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, "Xft/Antialias") == 0)
             {
               settings->seen |= SEEN_AA;
               settings->aa = ival != 0;
@@ -366,11 +394,7 @@ parse_xft_settings (prop, bytes, settings)
               else
                 settings->seen &= ~SEEN_LCDFILTER;
             }
-          else if (strcmp (name, XSETTINGS_FONT_NAME) == 0)
-            {
-              free (current_font);
-              current_font = xstrdup (sval);
-            }
+#endif /* HAVE_XFT */
         }
     }
 
@@ -378,7 +402,7 @@ parse_xft_settings (prop, bytes, settings)
 }
 
 static int
-read_xft_settings (dpyinfo, settings)
+read_settings (dpyinfo, settings)
      struct x_display_info *dpyinfo;
      struct xsettings *settings;
 {
@@ -400,7 +424,7 @@ read_xft_settings (dpyinfo, settings)
 
   if (rc == Success && prop != NULL && act_form == 8 && nitems > 0
       && act_type == dpyinfo->Xatom_xsettings_prop)
-    rc = parse_xft_settings (prop, nitems, settings);
+    rc = parse_settings (prop, nitems, settings);
 
   XFree (prop);
 
@@ -411,18 +435,17 @@ read_xft_settings (dpyinfo, settings)
 
 
 static void
-apply_xft_settings (dpyinfo, send_event_p)
+apply_xft_settings (dpyinfo, send_event_p, settings)
      struct x_display_info *dpyinfo;
      int send_event_p;
+     struct xsettings *settings;
 {
+#ifdef HAVE_XFT
   FcPattern *pat;
-  struct xsettings settings, oldsettings;
+  struct xsettings oldsettings;
   int changed = 0;
   char buf[256];
 
-  if (!read_xft_settings (dpyinfo, &settings))
-    return;
-
   memset (&oldsettings, 0, sizeof (oldsettings));
   buf[0] = '\0';
   pat = FcPatternCreate ();
@@ -436,74 +459,74 @@ apply_xft_settings (dpyinfo, send_event_p)
   FcPatternGetInteger (pat, FC_RGBA, 0, &oldsettings.rgba);
   FcPatternGetDouble (pat, FC_DPI, 0, &oldsettings.dpi);
 
-  if ((settings.seen & SEEN_AA) != 0 && oldsettings.aa != settings.aa)
+  if ((settings->seen & SEEN_AA) != 0 && oldsettings.aa != settings->aa)
     {
       FcPatternDel (pat, FC_ANTIALIAS);
-      FcPatternAddBool (pat, FC_ANTIALIAS, settings.aa);
+      FcPatternAddBool (pat, FC_ANTIALIAS, settings->aa);
       ++changed;
-      oldsettings.aa = settings.aa;
+      oldsettings.aa = settings->aa;
     }
   sprintf (buf, "Antialias: %d", oldsettings.aa);
 
-  if ((settings.seen & SEEN_HINTING) != 0
-      && oldsettings.hinting != settings.hinting)
+  if ((settings->seen & SEEN_HINTING) != 0
+      && oldsettings.hinting != settings->hinting)
     {
       FcPatternDel (pat, FC_HINTING);
-      FcPatternAddBool (pat, FC_HINTING, settings.hinting);
+      FcPatternAddBool (pat, FC_HINTING, settings->hinting);
       ++changed;
-      oldsettings.hinting = settings.hinting;
+      oldsettings.hinting = settings->hinting;
     }
   if (strlen (buf) > 0) strcat (buf, ", ");
   sprintf (buf+strlen (buf), "Hinting: %d", oldsettings.hinting);
-  if ((settings.seen & SEEN_RGBA) != 0 && oldsettings.rgba != settings.rgba)
+  if ((settings->seen & SEEN_RGBA) != 0 && oldsettings.rgba != settings->rgba)
     {
       FcPatternDel (pat, FC_RGBA);
-      FcPatternAddInteger (pat, FC_RGBA, settings.rgba);
-      oldsettings.rgba = settings.rgba;
+      FcPatternAddInteger (pat, FC_RGBA, settings->rgba);
+      oldsettings.rgba = settings->rgba;
       ++changed;
     }
   if (strlen (buf) > 0) strcat (buf, ", ");
   sprintf (buf+strlen (buf), "RGBA: %d", oldsettings.rgba);
 
   /* Older fontconfig versions don't have FC_LCD_FILTER. */
-  if ((settings.seen & SEEN_LCDFILTER) != 0
-      && oldsettings.lcdfilter != settings.lcdfilter)
+  if ((settings->seen & SEEN_LCDFILTER) != 0
+      && oldsettings.lcdfilter != settings->lcdfilter)
     {
       FcPatternDel (pat, FC_LCD_FILTER);
-      FcPatternAddInteger (pat, FC_LCD_FILTER, settings.lcdfilter);
+      FcPatternAddInteger (pat, FC_LCD_FILTER, settings->lcdfilter);
       ++changed;
-      oldsettings.lcdfilter = settings.lcdfilter;
+      oldsettings.lcdfilter = settings->lcdfilter;
     }
   if (strlen (buf) > 0) strcat (buf, ", ");
   sprintf (buf+strlen (buf), "LCDFilter: %d", oldsettings.lcdfilter);
 
-  if ((settings.seen & SEEN_HINTSTYLE) != 0
-      && oldsettings.hintstyle != settings.hintstyle)
+  if ((settings->seen & SEEN_HINTSTYLE) != 0
+      && oldsettings.hintstyle != settings->hintstyle)
     {
       FcPatternDel (pat, FC_HINT_STYLE);
-      FcPatternAddInteger (pat, FC_HINT_STYLE, settings.hintstyle);
+      FcPatternAddInteger (pat, FC_HINT_STYLE, settings->hintstyle);
       ++changed;
-      oldsettings.hintstyle = settings.hintstyle;
+      oldsettings.hintstyle = settings->hintstyle;
     }
   if (strlen (buf) > 0) strcat (buf, ", ");
   sprintf (buf+strlen (buf), "Hintstyle: %d", oldsettings.hintstyle);
 
-  if ((settings.seen & SEEN_DPI) != 0 && oldsettings.dpi != settings.dpi
-      && settings.dpi > 0)
+  if ((settings->seen & SEEN_DPI) != 0 && oldsettings.dpi != settings->dpi
+      && settings->dpi > 0)
     {
       Lisp_Object frame, tail;
 
       FcPatternDel (pat, FC_DPI);
-      FcPatternAddDouble (pat, FC_DPI, settings.dpi);
+      FcPatternAddDouble (pat, FC_DPI, settings->dpi);
       ++changed;
-      oldsettings.dpi = settings.dpi;
+      oldsettings.dpi = settings->dpi;
       
       /* Change the DPI on this display and all frames on the display.  */
-      dpyinfo->resy = dpyinfo->resx = settings.dpi;
+      dpyinfo->resy = dpyinfo->resx = settings->dpi;
       FOR_EACH_FRAME (tail, frame)
         if (FRAME_X_P (XFRAME (frame))
             && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
-          XFRAME (frame)->resy = XFRAME (frame)->resx = settings.dpi;
+          XFRAME (frame)->resy = XFRAME (frame)->resx = settings->dpi;
     }
 
   if (strlen (buf) > 0) strcat (buf, ", ");
@@ -513,23 +536,68 @@ apply_xft_settings (dpyinfo, send_event_p)
     {
       XftDefaultSet (dpyinfo->display, pat);
       if (send_event_p)
-        store_font_changed_event (Qfont_render,
-                                  XCAR (dpyinfo->name_list_element));
+        store_config_changed_event (Qfont_render,
+                                    XCAR (dpyinfo->name_list_element));
       Vxft_settings = make_string (buf, strlen (buf));
     }
   else
     FcPatternDestroy (pat);
+#endif /* HAVE_XFT */
 }
 
-#endif /* HAVE_XFT */
+static void
+read_and_apply_settings (dpyinfo, send_event_p)
+     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;
+
+  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);
+        }
+      free (settings.tb_style);
+    }
+
+  if (settings.seen & SEEN_FONT)
+    {
+      if (!current_font || strcmp (current_font, settings.font) != 0) 
+        {
+          free (current_font);
+          current_font = settings.font;
+          if (send_event_p)
+            store_config_changed_event (Qfont_name, dpyname);
+        }
+      else
+        free (settings.font);
+    }
+}
 
 void
 xft_settings_event (dpyinfo, event)
      struct x_display_info *dpyinfo;
      XEvent *event;
 {
-#ifdef HAVE_XFT
   int check_window_p = 0;
+  int apply_settings = 0;
 
   switch (event->type)
     {
@@ -549,20 +617,21 @@ xft_settings_event (dpyinfo, event)
       if (event->xproperty.window == dpyinfo->xsettings_window
           && event->xproperty.state == PropertyNewValue
           && event->xproperty.atom == dpyinfo->Xatom_xsettings_prop)
-        {
-          apply_xft_settings (dpyinfo, True);
-        }
+        apply_settings = 1;
       break;
     }
 
+
   if (check_window_p)
     {
       dpyinfo->xsettings_window = None;
       get_prop_window (dpyinfo);
       if (dpyinfo->xsettings_window != None)
-        apply_xft_settings (dpyinfo, True);
+        apply_settings = 1;
     }
-#endif /* HAVE_XFT */
+
+  if (apply_settings)
+    read_and_apply_settings (dpyinfo, True);
 }
 
 
@@ -600,10 +669,9 @@ init_gconf ()
 }
 
 static void
-init_xfd_settings (dpyinfo)
+init_xsettings (dpyinfo)
      struct x_display_info *dpyinfo;
 {
-#ifdef HAVE_XFT
   char sel[64];
   Display *dpy = dpyinfo->display;
 
@@ -622,18 +690,9 @@ init_xfd_settings (dpyinfo)
 
   get_prop_window (dpyinfo);
   if (dpyinfo->xsettings_window != None)
-    apply_xft_settings (dpyinfo, False);
+    read_and_apply_settings (dpyinfo, False);
 
   UNBLOCK_INPUT;
-
-#else /* ! HAVE_XFT */
-
-  dpyinfo->Xatom_xsettings_sel = None;
-  dpyinfo->Xatom_xsettings_prop = None;
-  dpyinfo->Xatom_xsettings_mgr = None;
-  dpyinfo->xsettings_window = None;
-
-#endif /* ! HAVE_XFT */
 }
 
 void
@@ -642,7 +701,7 @@ xsettings_initialize (dpyinfo)
 {
   if (first_dpyinfo == NULL) first_dpyinfo = dpyinfo;
   init_gconf ();
-  init_xfd_settings (dpyinfo);
+  init_xsettings (dpyinfo);
 }
 
 const char *
@@ -678,6 +737,23 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
     : Qnil;
 }
 
+DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style,
+       0, 0, 0,
+       doc: /* Get the system tool bar style.
+If no system tool bar style is known, return `tool-bar-style' if set to a
+known style.  Otherwise return image.  */)
+  ()
+{
+  if (EQ (Vtool_bar_style, Qimage)
+      || EQ (Vtool_bar_style, Qtext)
+      || EQ (Vtool_bar_style, Qboth)
+      || EQ (Vtool_bar_style, Qboth_horiz))
+    return Vtool_bar_style;
+  if (!NILP (current_tool_bar_style))
+    return current_tool_bar_style;
+  return Qimage;
+}
+
 void
 syms_of_xsettings ()
 {
@@ -688,6 +764,8 @@ syms_of_xsettings ()
   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");
@@ -709,6 +787,13 @@ syms_of_xsettings ()
   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);
+  defsubr (&Stool_bar_get_system_style);
+
+  Fprovide (intern_c_string ("dynamic-setting"), Qnil);
 }
 
 /* arch-tag: 541716ed-2e6b-42e1-8212-3197e01ea61d
diff --git a/src/xsettings.h b/src/xsettings.h
index f6399ea1bcc..53fca2ad6b5 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 EXFUN (Ffont_get_system_font, 0);
 EXFUN (Ffont_get_system_normal_font, 0);
+EXFUN (Ftool_bar_get_system_style, 0);
 
 extern void xsettings_initialize P_ ((struct x_display_info *dpyinfo));
 extern void xft_settings_event P_ ((struct x_display_info *dpyinfo,
diff --git a/src/xsmfns.c b/src/xsmfns.c
index ec5ca3b1a9f..78d7d9f6523 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -90,6 +90,10 @@ Lisp_Object Vx_session_previous_id;
 
 #define NOSPLASH_OPT "--no-splash"
 
+/* The option to make Emacs start in the given directory.  */
+
+#define CHDIR_OPT "--chdir="
+
 static void
 ice_connection_closed ()
 {
@@ -206,7 +210,7 @@ smc_save_yourself_CB (smcConn,
   int props_idx = 0;
 
   char *cwd = NULL;
-  char *smid_opt;
+  char *smid_opt, *chdir_opt = NULL;
 
   /* How to start a new instance of Emacs.  */
   props[props_idx] = &prop_ptr[props_idx];
@@ -228,11 +232,12 @@ smc_save_yourself_CB (smcConn,
   props[props_idx]->vals[0].value = SDATA (Vinvocation_name);
   ++props_idx;
 
-  /* How to restart Emacs (i.e.: /path/to/emacs --smid=xxxx --no-splash).  */
+  /* How to restart Emacs.  */
   props[props_idx] = &prop_ptr[props_idx];
   props[props_idx]->name = SmRestartCommand;
   props[props_idx]->type = SmLISTofARRAY8;
-  props[props_idx]->num_vals = 3; /* /path/to/emacs, --smid=xxx --no-splash  */
+  /* /path/to/emacs, --smid=xxx --no-splash --chdir=dir */
+  props[props_idx]->num_vals = 4;
   props[props_idx]->vals = &values[val_idx];
   props[props_idx]->vals[0].length = strlen (emacs_program);
   props[props_idx]->vals[0].value = emacs_program;
@@ -246,7 +251,19 @@ smc_save_yourself_CB (smcConn,
 
   props[props_idx]->vals[2].length = strlen (NOSPLASH_OPT);
   props[props_idx]->vals[2].value = NOSPLASH_OPT;
-  val_idx += 3;
+
+  cwd = get_current_dir_name ();
+  if (cwd) 
+    {
+      chdir_opt = xmalloc (strlen (CHDIR_OPT) + strlen (cwd) + 1);
+      strcpy (chdir_opt, CHDIR_OPT);
+      strcat (chdir_opt, cwd);
+
+      props[props_idx]->vals[3].length = strlen (chdir_opt);
+      props[props_idx]->vals[3].value = chdir_opt;
+    }
+
+  val_idx += cwd ? 4 : 3;
   ++props_idx;
 
   /* User id.  */
@@ -259,7 +276,6 @@ smc_save_yourself_CB (smcConn,
   props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
   ++props_idx;
 
-  cwd = get_current_dir_name ();
 
   if (cwd)
     {
@@ -277,6 +293,7 @@ smc_save_yourself_CB (smcConn,
   SmcSetProperties (smcConn, props_idx, props);
 
   xfree (smid_opt);
+  xfree (chdir_opt);
 
   free (cwd);
 
diff --git a/src/xterm.c b/src/xterm.c
index 29ed5bb865c..f867632f22f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2291,7 +2291,7 @@ static void
 x_draw_image_relief (s)
      struct glyph_string *s;
 {
-  int x0, y0, x1, y1, thick, raised_p;
+  int x0, y0, x1, y1, thick, raised_p, extra;
   XRectangle r;
   int x = s->x;
   int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
@@ -2322,10 +2322,13 @@ x_draw_image_relief (s)
       raised_p = s->img->relief > 0;
     }
 
-  x0 = x - thick;
-  y0 = y - thick;
-  x1 = x + s->slice.width + thick - 1;
-  y1 = y + s->slice.height + thick - 1;
+  extra = s->face->id == TOOL_BAR_FACE_ID
+    ? XINT (Vtool_bar_button_margin) : 0;
+  
+  x0 = x - thick - extra;
+  y0 = y - thick - extra;
+  x1 = x + s->slice.width + thick - 1 + extra;
+  y1 = y + s->slice.height + thick - 1 + extra;
 
   x_setup_relief_colors (s);
   get_glyph_string_clip_rect (s, &r);
@@ -7492,36 +7495,40 @@ x_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, activ
       w->phys_cursor_on_p = 1;
 
       if (glyph_row->exact_window_width_line_p
-          && w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA])
+          && (glyph_row->reversed_p
+              ? (w->phys_cursor.hpos < 0)
+              : (w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA])))
         {
           glyph_row->cursor_in_fringe_p = 1;
-          draw_fringe_bitmap (w, glyph_row, 0);
+          draw_fringe_bitmap (w, glyph_row, glyph_row->reversed_p);
         }
       else
-      switch (cursor_type)
         {
-        case HOLLOW_BOX_CURSOR:
-          x_draw_hollow_cursor (w, glyph_row);
-          break;
+          switch (cursor_type)
+            {
+            case HOLLOW_BOX_CURSOR:
+              x_draw_hollow_cursor (w, glyph_row);
+              break;
 
-        case FILLED_BOX_CURSOR:
-          draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR);
-          break;
+            case FILLED_BOX_CURSOR:
+              draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR);
+              break;
 
-        case BAR_CURSOR:
-          x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR);
-          break;
+            case BAR_CURSOR:
+              x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR);
+              break;
 
-        case HBAR_CURSOR:
-          x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR);
-          break;
+            case HBAR_CURSOR:
+              x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR);
+              break;
 
-        case NO_CURSOR:
-          w->phys_cursor_width = 0;
-          break;
+            case NO_CURSOR:
+              w->phys_cursor_width = 0;
+              break;
 
-        default:
-          abort ();
+            default:
+              abort ();
+            }
         }
 
 #ifdef HAVE_X_I18N
@@ -7929,8 +7936,8 @@ x_connection_closed (dpy, error_message)
       if (terminal_list->next_terminal == NULL)
         {
           fprintf (stderr, "%s\n", error_msg);
-          shut_down_emacs (0, 0, Qnil);
-          exit (70);
+          Fkill_emacs (make_number (70));
+          /* NOTREACHED */
         }
       xg_display_close (dpyinfo->display);
 #endif
@@ -7956,8 +7963,8 @@ x_connection_closed (dpy, error_message)
   if (terminal_list == 0)
     {
       fprintf (stderr, "%s\n", error_msg);
-      shut_down_emacs (0, 0, Qnil);
-      exit (70);
+      Fkill_emacs (make_number (70));
+      /* NOTREACHED */
     }
 
   /* Ordinary stack unwind doesn't deal with these.  */