upstream

58 files changed, 1112 insertions, 846 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index c044b404f9b..620ca63a0d6 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -46,17 +46,29 @@ handle SIGALRM ignore
 # Use $bugfix so that the value isn't a constant.
 # Using a constant runs into GDB bugs sometimes.
 define xgetptr
-  set $bugfix = CHECK_LISP_OBJECT_TYPE ? $arg0.i : $arg0
+  if (CHECK_LISP_OBJECT_TYPE)
+    set $bugfix = $arg0.i
+  else
+    set $bugfix = $arg0
+  end
   set $ptr = ($bugfix & VALMASK) | DATA_SEG_BITS
 end
 
 define xgetint
-  set $bugfix = CHECK_LISP_OBJECT_TYPE ? $arg0.i : $arg0
-  set $int = USE_LSB_TAG ? $bugfix >> INTTYPEBITS : $bugfix << INTTYPEBITS >> INTTYPEBITS
+  if (CHECK_LISP_OBJECT_TYPE)
+    set $bugfix = $arg0.i
+  else
+    set $bugfix = $arg0
+  end
+  set $int = $bugfix << (USE_LSB_TAG ? 0 : INTTYPEBITS) >> INTTYPEBITS
 end
 
 define xgettype
-  set $bugfix = CHECK_LISP_OBJECT_TYPE ? $arg0.i : $arg0
+  if (CHECK_LISP_OBJECT_TYPE)
+    set $bugfix = $arg0.i
+  else
+    set $bugfix = $arg0
+  end
   set $type = (enum Lisp_Type) (USE_LSB_TAG ? $bugfix & (1 << GCTYPEBITS) - 1 : $bugfix >> VALBITS)
 end
 
@@ -641,7 +653,11 @@ end
 define xvectype
   xgetptr $
   set $size = ((struct Lisp_Vector *) $ptr)->header.size
-  output ($size & PSEUDOVECTOR_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size & ~ARRAY_MARK_FLAG
+  if ($size & PSEUDOVECTOR_FLAG)
+    output (enum pvec_type) (($size & PVEC_TYPE_MASK) >> PSEUDOVECTOR_SIZE_BITS)
+  else
+    output $size & ~ARRAY_MARK_FLAG
+  end
   echo \n
 end
 document xvectype
@@ -980,7 +996,7 @@ define xpr
   if $type == Lisp_Vectorlike
     set $size = ((struct Lisp_Vector *) $ptr)->header.size
     if ($size & PSEUDOVECTOR_FLAG)
-      set $vec = (enum pvec_type) ($size & PVEC_TYPE_MASK)
+      set $vec = (enum pvec_type) (($size & PVEC_TYPE_MASK) >> PSEUDOVECTOR_SIZE_BITS)
       if $vec == PVEC_NORMAL_VECTOR
         xvector
       end
@@ -1115,7 +1131,11 @@ define xbacktrace
       if $type == Lisp_Vectorlike
         xgetptr (*$bt->function)
         set $size = ((struct Lisp_Vector *) $ptr)->header.size
-        output ($size & PSEUDOVECTOR_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size & ~ARRAY_MARK_FLAG
+        if ($size & PSEUDOVECTOR_FLAG)
+          output (enum pvec_type) (($size & PVEC_TYPE_MASK) >> PSEUDOVECTOR_SIZE_BITS)
+        else
+          output $size & ~ARRAY_MARK_FLAG
+        end
       else
         printf "Lisp type %d", $type
       end
diff --git a/src/ChangeLog b/src/ChangeLog
index 7e91158ee36..f3e8b58e071 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,312 @@
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+        * conf_post.h: New, split from configure.ac's AH_BOTTOM.
+        * Makefile.in (config_h): Add conf_post.h.
+        * makefile.w32-in (CONFIG_H): Add conf_post.h.
+
+2012-07-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_do_open_file): New variable.
+        (ns_term_init): Set ns_do_open_file to NO after run returns.
+        (openFile, openTempFile, openFileWithoutUI, openFiles): Open
+        files only if ns_do_open_file.
+
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lisp.h (SWITCH_ENUM_CAST): Remove.  All uses removed.
+        This no-op macro hasn't been needed for many years.
+        * src/regex.c (SWITCH_ENUM_CAST) [!emacs]: Likewise.
+
+        Export DIRECTORY_SEP, TYPEMASK, VALMASK to GDB.
+        * alloc.c (gdb_make_enums_visible) [USE_LSB_TAG]: Add lsb_bits.
+        * lisp.h (enum lsb_bits) [USE_LSB_TAG]: New enum, for
+        gdb_make_enums_visible.
+        (TYPEMASK, VALMASK) [USE_LSB_TAGS]: Now enum constants, not macros.
+        (DIRECTORY_SEP): Now a constant, not a macro.
+
+2012-07-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (w32_wnd_proc): Pass w32_keyboard_codepage to
+        w32_kbd_patch_key as the 2nd arg.  (Bug#12082)
+
+        * w32term.c <w32_keyboard_codepage>: Renamed from
+        keyboard_codepage and now external.  All users changed.
+
+        * w32term.h: Add declaration of w32_keyboard_codepage.
+
+        * w32inevt.c (w32_kbd_patch_key): Accept an additional argument --
+        the codepage to translate keys to Unicode.  If this argument is
+        -1, use the value returned by GetConsoleCP.  All callers changed.
+
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Update .PHONY listings in makefiles.
+        * Makefile.in (.PHONY): Add all, mostlyclean, clean,
+        bootstrap-clean, distclean, maintainer-clean, versioclean,
+        extraclean, frc.
+
+        * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t.
+        This is a bit clearer.  Fix some commentary typos.
+
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+        * s/netbsd.h: Let configure include signal.h if needed.
+        Remove file, which is now empty.
+
+        * s/usg5-4-common.h (_longjmp, _setjmp, TIOCSIGSEND):
+        Let configure set them.
+        * s/irix6-5.h (_longjmp, _setjmp, TIOCSIGSEND):
+        No more need to undefine.
+
+2012-07-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keymap.c (Fkey_description): Don't remove 0x80 bit from
+        non-single-byte char when adding meta modifier.  (Bug#12090)
+
+2012-07-30  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Convert safe_call to use variable number of arguments.
+        * xdisp.c (safe_call): Convert to use varargs.  Adjust users.
+        (safe_call2): Fix comment.
+        * lisp.h (safe_call): Adjust prototype.
+        * coding.c (encode_coding_object): Change to use safe_call2.
+        * xfaces.c (merge_face_heights): Change to use safe_call1.
+
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+        * s/aix4-2.h (sigmask): No need to undefine it, since syssignal.h
+        does that unconditionally.  Remove file, which is now empty.
+
+        * s/freebsd.h, s/gnu-linux.h, s/sol2-6.h, s/unixware.h:
+        Remove empty files.
+
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Export to GDB most of lisp.h's remaining object-like macros.
+        * lisp.h (min, max): Move earlier, because they're used earlier now.
+        (INTMASK, ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK)
+        (CHAR_TABLE_STANDARD_SLOTS, CHARTAB_SIZE_BITS_0)
+        (CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2, CHARTAB_SIZE_BITS_3)
+        (DEFAULT_HASH_SIZE, COMPILED_ARGLIST, COMPILED_BYTECODE)
+        (COMPILED_CONSTANTS, COMPILED_STACK_DEPTH, COMPILED_DOC_STRING)
+        (COMPILED_INTERACTIVE, CHAR_ALT, CHAR_SUPER, CHAR_HYPER, CHAR_SHIFT)
+        (CHAR_CTL, CHAR_META, CHAR_MODIFIER_MASK, CHARACTERBITS)
+        (MANY, UNEVALLED, FLOAT_TO_STRING_BUFSIZE, MAX_ALLOCA):
+        Now constants, for GDB.  They need not be macros.
+        (MOST_POSITIVE_FIXNUM, MOST_NEGATIVE_FIXNUM, STRING_BYTES_BOUND):
+        Now constants, for GDB, as well as macros, for static initializers.
+        (CHAR_TABLE_STANDARD_SLOTS, CHAR_TABLE_EXTRA_SLOTS):
+        Move to after the definition of struct Lisp_Char_Table,
+        since the former now needs that type defined.
+        (enum CHARTAB_SIZE_BITS, enum CHAR_TABLE_STANDARD_SLOTS)
+        (enum DEFAULT_HASH_SIZE, enum Lisp_Compiled, enum char_bits)
+        (enum maxargs, enum FLOAT_TO_STRING_BUFSIZE, enum MAX_ALLOCA):
+        New enums, for gdb_make_enums_visible.
+        (GLYPH_MODE_LINE_FACE): Remove; unused.
+        * alloc.c (STRING_BYTES_MAX): Now a constant, not a macro.
+        (gdb_make_enums_visible): Add enum CHARTAB_SIZE_BITS, enum
+        CHAR_TABLE_STANDARD_SLOTS, enum char_bits, enum DEFAULT_HASH_SIZE,
+        enum FLOAT_TO_STRING_BUFSIZE, enum Lisp_Bits, enum Lisp_Compiled,
+        enum maxargs, enum MAX_ALLOCA.
+        (ARRAY_MARK_FLAG_VAL, PSEUDOVECTOR_FLAG_VAL, VALMASK_VAL): Remove.
+        (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Remove;
+        no longer needed, now that they are done in lisp.h.
+
+2012-07-30  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Cleanup string bytes checking.
+        * alloc.c (GC_STRING_BYTES, CHECK_STRING_BYTES): Remove.  Convert
+        all users to STRING_BYTES or string_bytes if GC_CHECK_STRING_BYTES.
+        (check_string_bytes): Define to empty if not GC_CHECK_STRING_BYTES.
+        (check_sblock, compact_small_strings): Simplify.
+
+2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lisp.h (LISP_INT_TAG, LISP_INT1_TAG, LISP_STRING_TAG): Remove.
+        These macros are confusing and no longer need to be defined, as
+        the enum values now suffice.  All uses replaced with definiens.
+        (Lisp_Int1, Lisp_String): Define directly; this is clearer.
+
+2012-07-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (LISP_H, $(BLD)/emacs.$(O), $(BLD)/w32inevt.$(O))
+        ($(BLD)/w32console.$(O)): Update dependencies.
+
+2012-07-29  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Remove HIDE_LISP_IMPLEMENTATION and cleanup cons free list check.
+        * lisp.h (HIDE_LISP_IMPLEMENTATION): Remove as useless for a long
+        time.  Adjust users.
+        (CHECK_CONS_LIST): Remove.  Convert all users to check_cons_list.
+
+2012-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
+        setting sitelisp (Bug#12010).
+
+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.
+
+        * w32heap.c (cache_system_info):
+        * w32.c (sys_rename):
+        * w32proc.c (find_child_console, sys_kill): All users changed.
+
+2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c (Fgarbage_collect): Indent as per usual Emacs style.
+
+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h.
+
+2012-07-29  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Cleanup statistics calculation in Fgarbage_collect.
+        * alloc.c (Fgarbage_collect): Rename t1 to meaningful start.  Fix
+        zombies percentage calculation.  Simplify elapsed time calculation.
+
+2012-07-29  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Generalize marker debugging code under MARKER_DEBUG and use eassert.
+        * insdel.c (CHECK_MARKERS, check_markers_debug_flag): Remove.
+        (gap_left, gap_right, adjust_markers_for_delete, insert_1_both)
+        (insert_from_string_1, insert_from_gap, insert_from_buffer_1)
+        (replace_range, replace_range_2, del_range_2): Change to eassert.
+        * marker.c (byte_char_debug_check): Adjust style.
+
+2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't use the abbreviation "win" to refer to Windows (Bug#10421).
+        * regex.c (MAX_BUF_SIZE): Remove some incorrect and
+        long-ago-commented-out code that talks about "WIN32".
+        * w32heap.h (OS_WINDOWS_95): Rename from OS_WIN95.
+        All uses changed.
+
+2012-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib stdalign module (Bug#9772, Bug#9960).
+        * alloc.c (XMALLOC_BASE_ALIGNMENT, GC_POINTER_ALIGNMENT, pure_alloc):
+        Simplify by using alignof.
+        (pure_alloc) [! USE_LSB_TAG]: Don't over-align EMACS_INT values.
+        * lisp.h: Include <stdalign.h>.
+        (GCALIGNMENT): New macro and constant.
+        (DECL_ALIGN): Remove.  All uses replaced by alignas (GCALIGNMENT).
+        (USE_LSB_TAG): ifdef on alignas, not on DECL_ALIGN.
+        (stdalign): New macro, if not already defined.
+
+2012-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix non-ASCII input in non-GUI frames on MS-Windows.  (Bug#12055)
+        * w32inevt.c: Include w32inevt.h.
+        (w32_read_console_input): New inline function, calls either
+        ReadConsoleInputA or ReadConsoleInputW, depending on the value of
+        w32_console_unicode_input.
+        (fill_queue): Call w32_read_console_input instead of ReadConsoleInput.
+        (w32_kbd_patch_key, key_event): Use the codepage returned by
+        GetConsoleCP, rather than the ANSI codepage returned by GetLocaleInfo.
+        (key_event): use uChar.UnicodeChar only if
+        w32_console_unicode_input is non-zero.
+
+        * w32console.c: Include w32heap.h.
+        <w32_console_unicode_input>: New global variable.
+        (initialize_w32_display): Set w32_console_unicode_input to 1 on NT
+        family of Windows, zero otherwise.
+
+        * w32inevt.h: Declare w32_console_unicode_input.
+
+        * xdisp.c (init_iterator): Don't reference tip_frame in a build
+        --without-x.  (Bug#11742)
+
+2012-07-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Adjust GDB to reflect pvec_type changes (Bug#12036).
+        * .gdbinit (xvectype, xpr, xbacktrace): Adjust to reflect the
+        2012-07-04 changes to pseudovector representation.  Problem
+        reported by Eli Zaretskii in <http://bugs.gnu.org/12036#30>.
+
+2012-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (XD_DBUS_VALIDATE_BUS_ADDRESS): Canonicalize session
+        bus address.
+        (xd_close_bus, Fdbus_init_bus): Handle reference counter properly.
+
+2012-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * alloc.c (listn): Fix the order the arguments are consed onto the
+        list.
+
+        * lisp.h (enum constype): Use CONSTYPE_HEAP and CONSTYPE_PURE for
+        enumeration constants, as PURE and HEAP are too general, and clash
+        with other headers and sources, such as gmalloc.c and the
+        MS-Windows system headers.  All users changed.
+
+2012-07-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Revert last save_excursion_save and save_excursion_restore changes.
+        * alloc.c, editfns.c, marker.c, lisp.h: Revert.
+        Lots of crashes reported by Chong Yidong <cyd@gnu.org>.
+
+2012-07-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Fix recently-introduced typos in Windows port.
+        Reported by Martin Rudalics <rudalics@gmx.at>.
+        * w32.c (init_environment): Replace comma with semicolon.
+        * w32fns.c (syms_of_w32fns): Add missing parenthesis.
+
+2012-07-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve GDB symbol export (Bug#12036).
+        * .gdbinit (xgetptr, xgetint, xgettype): Set $bugfix in different
+        arms of an 'if', not using conditional expressions; otherwise GDB
+        complains about the types in the unevaluated arm when the argument
+        is an integer literal.
+        (xgetint): Simplify expression.
+        * alloc.c (gdb_make_enums_visible): New constant.  This ports to
+        GCC 3.4.2 the export of symbols to GDB.  Problem reported by Eli
+        Zaretskii in <http://bugs.gnu.org/12036#13>.
+        * lisp.h (PUBLISH_TO_GDB): Remove.  All uses removed.  No longer
+        needed now that we have gdb_make_enums_visible.
+        (enum CHECK_LISP_OBJECT_TYPE, enum Lisp_Bits, enum More_Lisp_Bits)
+        (enum enum_USE_LSB_TAG):
+        New enum types, packaging up enums that need to be exported to GDB.
+
+2012-07-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Utility function to make a list from specified amount of objects.
+        * lisp.h (enum constype): New datatype.
+        (listn): New prototype.
+        * alloc.c (listn): New function.
+        (Fmemory_use_count, syms_of_alloc): Use it.
+        * buffer.c (syms_of_buffer): Likewise.
+        * callint.c (syms_of_callint): Likewise.
+        * charset.c (define_charset_internal): Likewise.
+        * coding.c (syms_of_coding): Likewise.
+        * keymap.c (syms_of_keymap): Likewise.
+        * search.c (syms_of_search): Likewise.
+        * syntax.c (syms_of_syntax): Likewise.
+        * w32.c (init_environment): Likewise.
+        * w32fns.c (Fw32_battery_status, syms_of_w32fns): Likewise.
+        * xdisp.c (syms_of_xdisp): Likewise.
+        * xfns.c (syms_of_xfns): Likewise.
+
+2012-07-27  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Fast save_excursion_save and save_excursion_restore.
+        * lisp.h (struct Lisp_Excursion): New data type.
+        (PVEC_EXCURSION): New pseudovector type.
+        (XEXCURSION, XSETEXCURSION, EXCURSIONP): Convenient macros
+        to deal with it.  Adjust comments.
+        (init_marker, attach_marker): New prototype.
+        (unchain_marker): Adjust prototype.
+        * marker.c (attach_marker): Change to global.
+        (init_marker): New function.
+        * alloc.c (Fmake_marker, build_marker): Use it.
+        (build_marker): More easserts.
+        (mark_object): Handle struct Lisp_Excursion.
+        * editfns.c (save_excursion_save, save_excursion_restore):
+        Reimplement to use struct Lisp_Excursion.  Add comments.
+
 2012-07-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix export of symbols to GDB (Bug#12036).
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index cf62ec29bbc..6eda101c815 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -15825,7 +15825,7 @@
         * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from
         xterm.c to handle overlaid fringe bitmaps and to use cursor color
         for displaying cursor in fringe.
-        (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
+        (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New Windows
         specific functions to define and destroy fringe bitmaps in fringe_bmp.
         (w32_redisplay_interface): Add them to redisplay_interface.
         (w32_term_init): Call w32_init_fringe instead of explicitly
@@ -21476,7 +21476,7 @@
         "Emacs built on Windows 9x/ME crashes at startup on Windows XP,
         or Emacs builtpart of on XP crashes at startup on Windows 9x/ME."
 
-        * w32.c: Added wrapper functions around the win32 API functions
+        * w32.c: Added wrapper functions around the Windows API functions
         OpenProcessToken, GetTokenInformation, LookupAccountSid, and
         GetSidIdentifierAuthority.  These wrapper functions serve two
         purposes:
@@ -21490,7 +21490,7 @@
         the version of advapi32.dll that is found in the 9x branch of
         Microsoft Windows.
 
-        * w32.c (init_user_info): Replace the calls to the win32 API
+        * w32.c (init_user_info): Replace the calls to the Windows API
         functions OpenProcessToken, GetTokenInformation, LookupAccountSid,
         and GetSidIdentifierAuthority with calls to the newly added
         wrapper functions.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 781027ee8ae..d3b0a8284b5 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -3994,7 +3994,8 @@
 
 2010-09-24  Juanma Barranquero  <lekktu@gmail.com>
 
-        Remove W32 API function pointer unused since 2005-02-15 (revno 2005-02-15T23:19:26Z!jasonr@gnu.org).
+        Remove Windows API function pointer unused since 2005-02-15 (revno
+        2005-02-15T23:19:26Z!jasonr@gnu.org).
         * w32fns.c (clipboard_sequence_fn): Don't declare.
         (globals_of_w32fns): Don't initialize it.
 
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 3aa1a23818e..64f8b3a8314 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1269,7 +1269,7 @@
         "light", "extralight", and "thin" fonts.
         (x_to_win32_charset, win32_to_x_charset): New functions.
         (win32_to_x_font): Use new height units.  Use win32_to_x_charset.
-        (x_to_win32_font): Use x_to_win32_charset.  Support Win32 font names
+        (x_to_win32_font): Use x_to_win32_charset.  Support w32 font names
         in addition to X font names.
 
         (win32_load_font, Fx_list_fonts, Fx_display_color_cells)
@@ -3625,11 +3625,11 @@
 
         * xdisp.c [HAVE_NTGUI] (set_menu_framebar): Declare external.
         [HAVE_NTGUI] (frame_title_buf, frame_title_ptr): Include variables
-        for Win32 window system.
+        for w32 window system.
         [HAVE_NTGUI] (store_frame_title, x_consider_frame_title): Include
-        procedures for Win32 window system.
-        [HAVE_NTGUI] (x_consider_frame_title): Test for Win32 frame.
-        [HAVE_NTGUI] (display_text_line): Test for Win32 frame on face change.
+        procedures for w32 window system.
+        [HAVE_NTGUI] (x_consider_frame_title): Test for w32 frame.
+        [HAVE_NTGUI] (display_text_line): Test for w32 frame on face change.
         [HAVE_NTGUI] (display_menu_bar): Perform no-op for NT window system.
 
         * window.c [HAVE_NTGUI] (Fset_window_configuration): Set menu
@@ -3659,7 +3659,7 @@
         (make_lispy_event): Use FUNCTION_KEY_OFFSET to modify event codes
         before applying modifiers.
 
-        * frame.c [HAVE_NTGUI]: Test for a Win32 frame in procedures
+        * frame.c [HAVE_NTGUI]: Test for a w32 frame in procedures
         that test for an X frame.
 
         * frame.h (output_method): New method: output_win32.
@@ -3673,13 +3673,13 @@
         * emacs.c [HAVE_NTGUI]: Declare Vwindow_system.
         [HAVE_NTGUI] (main): Enable inhibit_window_system.
         Initialize environment from registry.
-        Declare syms of Win32 windowing modules.
+        Declare syms of w32 windowing modules.
 
         * dispnew.c [HAVE_NTGUI]: Include w32term.h.
         Include dispextern.h before cm.h since dispextern.h includes windows.h.
         [HAVE_NTGUI] (make_frame_glyphs, free_frame_glyphs, scroll_frame_lines)
-        (update_frame, update_line): Test for WIN32 frame.
-        [HAVE_NTGUI] (init_display): Initialize WIN32 window system.
+        (update_frame, update_line): Test for w32 frame.
+        [HAVE_NTGUI] (init_display): Initialize w32 window system.
 
         * dispextern.h [HAVE_NTGUI]: Include win32.h.
         [HAVE_NTGUI] (struct frame_glyphs): Include pixel fields.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 0952826e8c6..ce240ab2928 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -2070,7 +2070,7 @@
         (sys_select): Ignore children dead children with pending input.
         Delay sending SIGCHLD until all output has been read.
         (sys_kill): Sleep to allow focus change events to propagate.
-        Use TerminateProcess on Win95.
+        Use TerminateProcess on Windows 95.
         (int_from_hex, enum_locale_fn, Fw32_get_valid_locale_ids):
         New functions.
         (Vw32_valid_locale_ids): New variable.
@@ -5719,13 +5719,13 @@
         Loop over handles round robin to ensure fairness.
         (sys_kill): Send ctrl-break and ctrl-c keystrokes to subprocesses
         on SIGINT if not sharing consoles, otherwise generate ctrl-break event.
-        On other termination signals, send WM_QUIT message to Win95 apps
+        On other termination signals, send WM_QUIT message to Windows 95 apps
         and WM_CLOSE to NT apps.
         (syms_of_ntproc): Intern new symbols.  defsubr new functions.
         DEFVAR new variables.
 
-        * w32term.c (SIF_*): Win95 macros defined for NT.
-        (struct tagSCROLLINFO): Win95 struct defined for NT.
+        * w32term.c (SIF_*): Windows 95 macros defined for NT.
+        (struct tagSCROLLINFO): Windows 95 struct defined for NT.
         (vertical_scroll_bar_min_handle, vertical_scroll_bar_top_border)
         (vertical_scroll_bar_bottom_border, last_scroll_bar_drag_pos)
         (Vw32_gab_focus_on_raise, Vw32_capslock_is_shiftlock):
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index d3ce1eb2a45..e68966b16a2 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13203,7 +13203,7 @@
         * w32.c (stat): GetFileInformationByHandle can legitimately fail,
         so don't rely on it succeeding.
 
-        * w32fns.c (x_to_w32_font): Specify DEFAULT_CHARSET in the w32
+        * w32fns.c (x_to_w32_font): Specify DEFAULT_CHARSET in the Windows
         LOGFONT struct if x font doesn't specify the charset.
         (x_to_w32_charset): Change >= to == when testing results of
         stricmp.
diff --git a/src/Makefile.in b/src/Makefile.in
index 9d835f4cd8c..c7fd697e48c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,7 +57,7 @@ lispdir = ../lisp
 
 # Configuration files for .o files to depend on.
 S_FILE = @S_FILE@
-config_h = config.h $(S_FILE)
+config_h = config.h conf_post.h $(S_FILE)
 
 bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT)
 
@@ -404,6 +404,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
    $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)
 
 all: emacs$(EXEEXT) $(OTHER_FILES)
+.PHONY: all
 
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
         cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
@@ -509,6 +510,8 @@ doc.o: buildobj.h
 ## If HAVE_NS, some ns-specific rules (for OTHER_FILES) are inserted here.
 @ns_frag@
 
+.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
+.PHONY: versioclean extraclean frc
 
 mostlyclean:
         rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a
diff --git a/src/alloc.c b/src/alloc.c
index ac6cb861c4d..5b2553c69cc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -29,11 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <pthread.h>
 #endif
 
-/* This file is part of the core Lisp implementation, and thus must
-   deal with the real data structures.  If the Lisp implementation is
-   replaced, this file likely will not be used.  */
-
-#undef HIDE_LISP_IMPLEMENTATION
 #include "lisp.h"
 #include "process.h"
 #include "intervals.h"
@@ -155,12 +150,6 @@ static pthread_mutex_t alloc_mutex;
 #define VECTOR_UNMARK(V)        ((V)->header.size &= ~ARRAY_MARK_FLAG)
 #define VECTOR_MARKED_P(V)      (((V)->header.size & ARRAY_MARK_FLAG) != 0)
 
-/* Value is the number of bytes of S, a pointer to a struct Lisp_String.
-   Be careful during GC, because S->size contains the mark bit for
-   strings.  */
-
-#define GC_STRING_BYTES(S)      (STRING_BYTES (S))
-
 /* Default value of gc_cons_threshold (see below).  */
 
 #define GC_DEFAULT_THRESHOLD (100000 * sizeof (Lisp_Object))
@@ -533,12 +522,7 @@ buffer_memory_full (ptrdiff_t nbytes)
    hold a size_t value and (2) the header size is a multiple of the
    alignment that Emacs needs for C types and for USE_LSB_TAG.  */
 #define XMALLOC_BASE_ALIGNMENT                          \
-  offsetof (                                            \
-    struct {                                            \
-      union { long double d; intmax_t i; void *p; } u;  \
-      char c;                                           \
-    },                                                  \
-    c)
+  alignof (union { long double d; intmax_t i; void *p; })
 
 #if USE_LSB_TAG
 # define XMALLOC_HEADER_ALIGNMENT \
@@ -1790,13 +1774,13 @@ static char const string_overrun_cookie[GC_STRING_OVERRUN_COOKIE_SIZE] =
    STRING_BYTES_BOUND, nor can it be so long that the size_t
    arithmetic in allocate_string_data would overflow while it is
    calculating a value to be passed to malloc.  */
-#define STRING_BYTES_MAX                                          \
-  min (STRING_BYTES_BOUND,                                        \
-       ((SIZE_MAX - XMALLOC_OVERRUN_CHECK_OVERHEAD                \
-         - GC_STRING_EXTRA                                        \
-         - offsetof (struct sblock, first_data)                   \
-         - SDATA_DATA_OFFSET)                                     \
-        & ~(sizeof (EMACS_INT) - 1)))
+static ptrdiff_t const STRING_BYTES_MAX =
+  min (STRING_BYTES_BOUND,
+       ((SIZE_MAX - XMALLOC_OVERRUN_CHECK_OVERHEAD
+         - GC_STRING_EXTRA
+         - offsetof (struct sblock, first_data)
+         - SDATA_DATA_OFFSET)
+        & ~(sizeof (EMACS_INT) - 1)));
 
 /* Initialize string allocation.  Called from init_alloc_once.  */
 
@@ -1812,10 +1796,8 @@ init_strings (void)
 
 static int check_string_bytes_count;
 
-#define CHECK_STRING_BYTES(S)   STRING_BYTES (S)
-
-
-/* Like GC_STRING_BYTES, but with debugging check.  */
+/* Like STRING_BYTES, but with debugging check.  Can be
+   called during GC, so pay attention to the mark bit.  */
 
 ptrdiff_t
 string_bytes (struct Lisp_String *s)
@@ -1847,15 +1829,8 @@ check_sblock (struct sblock *b)
 
       /* Check that the string size recorded in the string is the
          same as the one recorded in the sdata structure.  */
-      if (from->string)
-        CHECK_STRING_BYTES (from->string);
-
-      if (from->string)
-        nbytes = GC_STRING_BYTES (from->string);
-      else
-        nbytes = SDATA_NBYTES (from);
-
-      nbytes = SDATA_SIZE (nbytes);
+      nbytes = SDATA_SIZE (from->string ? string_bytes (from->string)
+                           : SDATA_NBYTES (from));
       from_end = (struct sdata *) ((char *) from + nbytes + GC_STRING_EXTRA);
     }
 }
@@ -1876,7 +1851,7 @@ check_string_bytes (int all_p)
         {
           struct Lisp_String *s = b->first_data.string;
           if (s)
-            CHECK_STRING_BYTES (s);
+            string_bytes (s);
         }
 
       for (b = oldest_sblock; b; b = b->next)
@@ -1886,6 +1861,10 @@ check_string_bytes (int all_p)
     check_sblock (current_sblock);
 }
 
+#else /* not GC_CHECK_STRING_BYTES */
+
+#define check_string_bytes(all) ((void) 0)
+
 #endif /* GC_CHECK_STRING_BYTES */
 
 #ifdef GC_CHECK_STRING_FREE_LIST
@@ -1997,7 +1976,7 @@ allocate_string_data (struct Lisp_String *s,
   if (s->data)
     {
       old_data = SDATA_OF_STRING (s);
-      old_nbytes = GC_STRING_BYTES (s);
+      old_nbytes = STRING_BYTES (s);
     }
   else
     old_data = NULL;
@@ -2131,10 +2110,10 @@ sweep_strings (void)
                      how large that is.  Reset the sdata's string
                      back-pointer so that we know it's free.  */
 #ifdef GC_CHECK_STRING_BYTES
-                  if (GC_STRING_BYTES (s) != SDATA_NBYTES (data))
+                  if (string_bytes (s) != SDATA_NBYTES (data))
                     abort ();
 #else
-                  data->u.nbytes = GC_STRING_BYTES (s);
+                  data->u.nbytes = STRING_BYTES (s);
 #endif
                   data->string = NULL;
 
@@ -2237,22 +2216,17 @@ compact_small_strings (void)
           /* Compute the next FROM here because copying below may
              overwrite data we need to compute it.  */
           ptrdiff_t nbytes;
+          struct Lisp_String *s = from->string;
 
 #ifdef GC_CHECK_STRING_BYTES
           /* Check that the string size recorded in the string is the
              same as the one recorded in the sdata structure. */
-          if (from->string
-              && GC_STRING_BYTES (from->string) != SDATA_NBYTES (from))
+          if (s && string_bytes (s) != SDATA_NBYTES (from))
             abort ();
 #endif /* GC_CHECK_STRING_BYTES */
 
-          if (from->string)
-            nbytes = GC_STRING_BYTES (from->string);
-          else
-            nbytes = SDATA_NBYTES (from);
-
-          if (nbytes > LARGE_STRING_BYTES)
-            abort ();
+          nbytes = s ? STRING_BYTES (s) : SDATA_NBYTES (from);
+          eassert (nbytes <= LARGE_STRING_BYTES);
 
           nbytes = SDATA_SIZE (nbytes);
           from_end = (struct sdata *) ((char *) from + nbytes + GC_STRING_EXTRA);
@@ -2264,8 +2238,8 @@ compact_small_strings (void)
             abort ();
 #endif
 
-          /* FROM->string non-null means it's alive.  Copy its data.  */
-          if (from->string)
+          /* Non-NULL S means it's alive.  Copy its data.  */
+          if (s)
             {
               /* If TB is full, proceed with the next sblock.  */
               to_end = (struct sdata *) ((char *) to + nbytes + GC_STRING_EXTRA);
@@ -2811,6 +2785,38 @@ list5 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, L
                                                        Fcons (arg5, Qnil)))));
 }
 
+/* Make a list of COUNT Lisp_Objects, where ARG is the
+   first one.  Allocate conses from pure space if TYPE
+   is CONSTYPE_PURE, or allocate as usual if type is CONSTYPE_HEAP.  */
+
+Lisp_Object
+listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...)
+{
+  va_list ap;
+  ptrdiff_t i;
+  Lisp_Object val, *objp;
+
+  /* Change to SAFE_ALLOCA if you hit this eassert.  */
+  eassert (count <= MAX_ALLOCA / sizeof (Lisp_Object));
+
+  objp = alloca (count * sizeof (Lisp_Object));
+  objp[0] = arg;
+  va_start (ap, arg);
+  for (i = 1; i < count; i++)
+    objp[i] = va_arg (ap, Lisp_Object);
+  va_end (ap);
+
+  for (val = Qnil, i = count - 1; i >= 0; i--)
+    {
+      if (type == CONSTYPE_PURE)
+        val = pure_cons (objp[i], val);
+      else if (type == CONSTYPE_HEAP)
+        val = Fcons (objp[i], val);
+      else
+        abort ();
+    }
+  return val;
+}
 
 DEFUN ("list", Flist, Slist, 0, MANY, 0,
        doc: /* Return a newly created list with specified arguments as elements.
@@ -4620,10 +4626,10 @@ mark_maybe_pointer (void *p)
 }
 
 
-/* Alignment of pointer values.  Use offsetof, as it sometimes returns
+/* Alignment of pointer values.  Use alignof, as it sometimes returns
    a smaller alignment than GCC's __alignof__ and mark_memory might
    miss objects if __alignof__ were used.  */
-#define GC_POINTER_ALIGNMENT offsetof (struct {char a; void *b;}, b)
+#define GC_POINTER_ALIGNMENT alignof (void *)
 
 /* Define POINTERS_MIGHT_HIDE_IN_OBJECTS to 1 if marking via C pointers does
    not suffice, which is the typical case.  A host where a Lisp_Object is
@@ -5071,17 +5077,11 @@ pure_alloc (size_t size, int type)
 #if USE_LSB_TAG
   size_t alignment = (1 << GCTYPEBITS);
 #else
-  size_t alignment = sizeof (EMACS_INT);
+  size_t alignment = alignof (EMACS_INT);
 
   /* Give Lisp_Floats an extra alignment.  */
   if (type == Lisp_Float)
-    {
-#if defined __GNUC__ && __GNUC__ >= 2
-      alignment = __alignof (struct Lisp_Float);
-#else
-      alignment = sizeof (struct Lisp_Float);
-#endif
-    }
+    alignment = alignof (struct Lisp_Float);
 #endif
 
  again:
@@ -5416,7 +5416,7 @@ See Info node `(elisp)Garbage Collection'.  */)
   int message_p;
   Lisp_Object total[11];
   ptrdiff_t count = SPECPDL_INDEX ();
-  EMACS_TIME t1;
+  EMACS_TIME start;
 
   if (abort_on_gc)
     abort ();
@@ -5426,14 +5426,14 @@ See Info node `(elisp)Garbage Collection'.  */)
   if (pure_bytes_used_before_overflow)
     return Qnil;
 
-  CHECK_CONS_LIST ();
+  check_cons_list ();
 
   /* Don't keep undo information around forever.
      Do this early on, so it is no problem if the user quits.  */
   FOR_EACH_BUFFER (nextb)
     compact_buffer (nextb);
 
-  t1 = current_emacs_time ();
+  start = current_emacs_time ();
 
   /* In case user calls debug_print during GC,
      don't let that cause a recursive GC.  */
@@ -5594,7 +5594,7 @@ See Info node `(elisp)Garbage Collection'.  */)
 
   UNBLOCK_INPUT;
 
-  CHECK_CONS_LIST ();
+  check_cons_list ();
 
   gc_in_progress = 0;
 
@@ -5685,18 +5685,16 @@ See Info node `(elisp)Garbage Collection'.  */)
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
   {
     /* Compute average percentage of zombies.  */
-    double nlive = 0;
-
-    for (i = 0; i < 7; ++i)
-      if (CONSP (total[i]))
-        nlive += XFASTINT (XCAR (total[i]));
+    double nlive =
+      (total_conses + total_symbols + total_markers + total_strings
+       + total_vectors + total_floats + total_intervals + total_buffers);
 
     avg_live = (avg_live * ngcs + nlive) / (ngcs + 1);
     max_live = max (nlive, max_live);
     avg_zombies = (avg_zombies * ngcs + nzombies) / (ngcs + 1);
     max_zombies = max (nzombies, max_zombies);
     ++ngcs;
-    }
+  }
 #endif
 
   if (!NILP (Vpost_gc_hook))
@@ -5709,10 +5707,9 @@ See Info node `(elisp)Garbage Collection'.  */)
   /* Accumulate statistics.  */
   if (FLOATP (Vgc_elapsed))
     {
-      EMACS_TIME t2 = current_emacs_time ();
-      EMACS_TIME t3 = sub_emacs_time (t2, t1);
+      EMACS_TIME since_start = sub_emacs_time (current_emacs_time (), start);
       Vgc_elapsed = make_float (XFLOAT_DATA (Vgc_elapsed)
-                                + EMACS_TIME_TO_DOUBLE (t3));
+                                + EMACS_TIME_TO_DOUBLE (since_start));
     }
 
   gcs_done++;
@@ -5929,7 +5926,7 @@ mark_object (Lisp_Object arg)
 
 #endif /* not GC_CHECK_MARKED_OBJECTS */
 
-  switch (SWITCH_ENUM_CAST (XTYPE (obj)))
+  switch (XTYPE (obj))
     {
     case Lisp_String:
       {
@@ -5942,7 +5939,7 @@ mark_object (Lisp_Object arg)
 #ifdef GC_CHECK_STRING_BYTES
         /* Check that the string size recorded in the string is the
            same as the one recorded in the sdata structure.  */
-        CHECK_STRING_BYTES (ptr);
+        string_bytes (ptr);
 #endif /* GC_CHECK_STRING_BYTES */
       }
       break;
@@ -6281,10 +6278,7 @@ gc_sweep (void)
   sweep_weak_hash_tables ();
 
   sweep_strings ();
-#ifdef GC_CHECK_STRING_BYTES
-  if (!noninteractive)
-    check_string_bytes (1);
-#endif
+  check_string_bytes (!noninteractive);
 
   /* Put all unmarked conses on free list */
   {
@@ -6604,11 +6598,7 @@ gc_sweep (void)
   }
 
   sweep_vectors ();
-
-#ifdef GC_CHECK_STRING_BYTES
-  if (!noninteractive)
-    check_string_bytes (1);
-#endif
+  check_string_bytes (!noninteractive);
 }
 
 
@@ -6644,18 +6634,15 @@ Frames, windows, buffers, and subprocesses count as vectors
   (but the contents of a buffer's text do not count here).  */)
   (void)
 {
-  Lisp_Object consed[8];
-
-  consed[0] = bounded_number (cons_cells_consed);
-  consed[1] = bounded_number (floats_consed);
-  consed[2] = bounded_number (vector_cells_consed);
-  consed[3] = bounded_number (symbols_consed);
-  consed[4] = bounded_number (string_chars_consed);
-  consed[5] = bounded_number (misc_objects_consed);
-  consed[6] = bounded_number (intervals_consed);
-  consed[7] = bounded_number (strings_consed);
-
-  return Flist (8, consed);
+  return listn (CONSTYPE_HEAP, 8,
+                bounded_number (cons_cells_consed),
+                bounded_number (floats_consed),
+                bounded_number (vector_cells_consed),
+                bounded_number (symbols_consed),
+                bounded_number (string_chars_consed),
+                bounded_number (misc_objects_consed),
+                bounded_number (intervals_consed),
+                bounded_number (strings_consed));
 }
 
 /* Find at most FIND_MAX symbols which have OBJ as their value or
@@ -6836,8 +6823,8 @@ do hash-consing of the objects allocated to pure space.  */);
   /* We build this in advance because if we wait until we need it, we might
      not be able to allocate the memory to hold it.  */
   Vmemory_signal_data
-    = pure_cons (Qerror,
-                 pure_cons (build_pure_c_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs"), Qnil));
+    = listn (CONSTYPE_PURE, 2, Qerror,
+             build_pure_c_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs"));
 
   DEFVAR_LISP ("memory-full", Vmemory_full,
                doc: /* Non-nil means Emacs cannot get much more Lisp memory.  */);
@@ -6876,28 +6863,26 @@ The time is in seconds as a floating point value.  */);
 #endif
 }
 
-/* Make some symbols visible to GDB.  These cannot be done as enums, like
-   GCTYPEBITS or USE_LSB_TAG, since values might not be in 'int' range.
-   Each symbol X has a corresponding X_VAL symbol, verified to have
-   the correct value.
-
-   This is last, so that the #undef lines don't mess up later code.  */
-
-#define ARRAY_MARK_FLAG_VAL PTRDIFF_MIN
-#define PSEUDOVECTOR_FLAG_VAL (PTRDIFF_MAX - PTRDIFF_MAX / 2)
-#define VALMASK_VAL (USE_LSB_TAG ? -1 << GCTYPEBITS : VAL_MAX)
-
-verify (ARRAY_MARK_FLAG_VAL == ARRAY_MARK_FLAG);
-verify (PSEUDOVECTOR_FLAG_VAL == PSEUDOVECTOR_FLAG);
-verify (VALMASK_VAL == VALMASK);
-
-#undef ARRAY_MARK_FLAG
-#undef PSEUDOVECTOR_FLAG
-#undef VALMASK
-
-ptrdiff_t const EXTERNALLY_VISIBLE
-  ARRAY_MARK_FLAG = ARRAY_MARK_FLAG_VAL,
-  PSEUDOVECTOR_FLAG = PSEUDOVECTOR_FLAG_VAL;
-
-EMACS_INT const EXTERNALLY_VISIBLE
-  VALMASK = VALMASK_VAL;
+/* When compiled with GCC, GDB might say "No enum type named
+   pvec_type" if we don't have at least one symbol with that type, and
+   then xbacktrace could fail.  Similarly for the other enums and
+   their values.  */
+union
+{
+  enum CHARTAB_SIZE_BITS CHARTAB_SIZE_BITS;
+  enum CHAR_TABLE_STANDARD_SLOTS CHAR_TABLE_STANDARD_SLOTS;
+  enum char_bits char_bits;
+  enum CHECK_LISP_OBJECT_TYPE CHECK_LISP_OBJECT_TYPE;
+  enum DEFAULT_HASH_SIZE DEFAULT_HASH_SIZE;
+  enum enum_USE_LSB_TAG enum_USE_LSB_TAG;
+  enum FLOAT_TO_STRING_BUFSIZE FLOAT_TO_STRING_BUFSIZE;
+  enum Lisp_Bits Lisp_Bits;
+  enum Lisp_Compiled Lisp_Compiled;
+  enum maxargs maxargs;
+  enum MAX_ALLOCA MAX_ALLOCA;
+  enum More_Lisp_Bits More_Lisp_Bits;
+  enum pvec_type pvec_type;
+#if USE_LSB_TAG
+  enum lsb_bits lsb_bits;
+#endif
+} const EXTERNALLY_VISIBLE gdb_make_enums_visible = {0};
diff --git a/src/buffer.c b/src/buffer.c
index 06d385110c6..833eb843168 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -56,7 +56,7 @@ struct buffer *all_buffers;
    Setting the default value also goes through the alist of buffers
    and stores into each buffer that does not say it has a local value.  */
 
-DECL_ALIGN (struct buffer, buffer_defaults);
+struct buffer alignas (GCALIGNMENT) buffer_defaults;
 
 /* A Lisp_Object pointer to the above, used for staticpro */
 
@@ -83,7 +83,7 @@ struct buffer buffer_local_flags;
 /* This structure holds the names of symbols whose values may be
    buffer-local.  It is indexed and accessed in the same way as the above. */
 
-DECL_ALIGN (struct buffer, buffer_local_symbols);
+struct buffer alignas (GCALIGNMENT) buffer_local_symbols;
 
 /* A Lisp_Object pointer to the above, used for staticpro */
 static Lisp_Object Vbuffer_local_symbols;
@@ -5212,7 +5212,7 @@ syms_of_buffer (void)
   DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions");
 
   Fput (Qprotected_field, Qerror_conditions,
-        pure_cons (Qprotected_field, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qprotected_field, Qerror));
   Fput (Qprotected_field, Qerror_message,
         build_pure_c_string ("Attempt to modify a protected field"));
 
@@ -5457,17 +5457,17 @@ Use the command `abbrev-mode' to change this variable.  */);
                      doc: /* Non-nil if searches and matches should ignore case.  */);
 
   DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
-                     make_number (LISP_INT_TAG),
+                     make_number (Lisp_Int0),
                      doc: /* Column beyond which automatic line-wrapping should happen.
 Interactively, you can set the buffer local value using \\[set-fill-column].  */);
 
   DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin),
-                     make_number (LISP_INT_TAG),
+                     make_number (Lisp_Int0),
                      doc: /* Column for the default `indent-line-function' to indent to.
 Linefeed indents to this column in Fundamental mode.  */);
 
   DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width),
-                     make_number (LISP_INT_TAG),
+                     make_number (Lisp_Int0),
                      doc: /* Distance between tab stops (for display of tab characters), in columns.
 This should be an integer greater than zero.  */);
 
@@ -5588,7 +5588,7 @@ If it is nil, that means don't auto-save this buffer.  */);
 Backing up is done before the first time the file is saved.  */);
 
   DEFVAR_PER_BUFFER ("buffer-saved-size", &BVAR (current_buffer, save_length),
-                     make_number (LISP_INT_TAG),
+                     make_number (Lisp_Int0),
                      doc: /* Length of current buffer when last read in, saved or auto-saved.
 0 initially.
 -1 means auto-saving turned off until next real save.
diff --git a/src/callint.c b/src/callint.c
index 58e1a5be2f4..4b53b5df34b 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -888,10 +888,11 @@ syms_of_callint (void)
   callint_message = Qnil;
   staticpro (&callint_message);
 
-  preserved_fns = pure_cons (intern_c_string ("region-beginning"),
-                         pure_cons (intern_c_string ("region-end"),
-                                pure_cons (intern_c_string ("point"),
-                                       pure_cons (intern_c_string ("mark"), Qnil))));
+  preserved_fns = listn (CONSTYPE_PURE, 4,
+                         intern_c_string ("region-beginning"),
+                         intern_c_string ("region-end"),
+                         intern_c_string ("point"),
+                         intern_c_string ("mark"));
 
   DEFSYM (Qlist, "list");
   DEFSYM (Qlet, "let");
diff --git a/src/charset.c b/src/charset.c
index 4c47ba45fb6..b621109b75d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1257,7 +1257,6 @@ define_charset_internal (Lisp_Object name,
 {
   const unsigned char *code_space = (const unsigned char *) code_space_chars;
   Lisp_Object args[charset_arg_max];
-  Lisp_Object plist[14];
   Lisp_Object val;
   int i;
 
@@ -1283,22 +1282,22 @@ define_charset_internal (Lisp_Object name,
   args[charset_arg_superset] = Qnil;
   args[charset_arg_unify_map] = Qnil;
 
-  plist[0] = intern_c_string (":name");
-  plist[1] = args[charset_arg_name];
-  plist[2] = intern_c_string (":dimension");
-  plist[3] = args[charset_arg_dimension];
-  plist[4] = intern_c_string (":code-space");
-  plist[5] = args[charset_arg_code_space];
-  plist[6] = intern_c_string (":iso-final-char");
-  plist[7] = args[charset_arg_iso_final];
-  plist[8] = intern_c_string (":emacs-mule-id");
-  plist[9] = args[charset_arg_emacs_mule_id];
-  plist[10] = intern_c_string (":ascii-compatible-p");
-  plist[11] = args[charset_arg_ascii_compatible_p];
-  plist[12] = intern_c_string (":code-offset");
-  plist[13] = args[charset_arg_code_offset];
-
-  args[charset_arg_plist] = Flist (14, plist);
+  args[charset_arg_plist] =
+    listn (CONSTYPE_HEAP, 14,
+           intern_c_string (":name"),
+           args[charset_arg_name],
+           intern_c_string (":dimension"),
+           args[charset_arg_dimension],
+           intern_c_string (":code-space"),
+           args[charset_arg_code_space],
+           intern_c_string (":iso-final-char"),
+           args[charset_arg_iso_final],
+           intern_c_string (":emacs-mule-id"),
+           args[charset_arg_emacs_mule_id],
+           intern_c_string (":ascii-compatible-p"),
+           args[charset_arg_ascii_compatible_p],
+           intern_c_string (":code-offset"),
+           args[charset_arg_code_offset]);
   Fdefine_charset_internal (charset_arg_max, args);
 
   return XINT (CHARSET_SYMBOL_ID (name));
diff --git a/src/coding.c b/src/coding.c
index 212eb8275fe..e4ed65079d9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7931,15 +7931,12 @@ encode_coding_object (struct coding_system *coding,
         }
 
       {
-        Lisp_Object args[3];
         struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 
         GCPRO5 (coding->src_object, coding->dst_object, src_object, dst_object,
                 old_deactivate_mark);
-        args[0] = CODING_ATTR_PRE_WRITE (attrs);
-        args[1] = make_number (BEG);
-        args[2] = make_number (Z);
-        safe_call (3, args);
+        safe_call2 (CODING_ATTR_PRE_WRITE (attrs),
+                    make_number (BEG), make_number (Z));
         UNGCPRO;
       }
       if (XBUFFER (coding->src_object) != current_buffer)
@@ -10411,7 +10408,7 @@ syms_of_coding (void)
 
   DEFSYM (Qcoding_system_error, "coding-system-error");
   Fput (Qcoding_system_error, Qerror_conditions,
-        pure_cons (Qcoding_system_error, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qcoding_system_error, Qerror));
   Fput (Qcoding_system_error, Qerror_message,
         build_pure_c_string ("Invalid coding system"));
 
diff --git a/src/composite.c b/src/composite.c
index bfc8093a87f..62ab3d04948 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -947,20 +947,12 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t
                                        string);
   if (NILP (LGSTRING_ID (lgstring)))
     {
-      Lisp_Object args[6];
-
       /* Save point as marker before calling out to lisp.  */
       if (NILP (string))
         record_unwind_protect (restore_point_unwind,
                                build_marker (current_buffer, pt, pt_byte));
-
-      args[0] = Vauto_composition_function;
-      args[1] = AREF (rule, 2);
-      args[2] = pos;
-      args[3] = make_number (to);
-      args[4] = font_object;
-      args[5] = string;
-      lgstring = safe_call (6, args);
+      lgstring = safe_call (6, Vauto_composition_function, AREF (rule, 2),
+                            pos, make_number (to), font_object, string);
     }
   return unbind_to (count, lgstring);
 }
diff --git a/src/conf_post.h b/src/conf_post.h
new file mode 100644
index 00000000000..5efecfb8c05
--- /dev/null
+++ b/src/conf_post.h
@@ -0,0 +1,131 @@
+/* conf_post.h --- configure.ac includes this via AH_BOTTOM
+
+Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012
+  Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Commentary:
+
+   Rather than writing this code directly in AH_BOTTOM, we include it
+   via this file.  This is so that it does not get processed by
+   autoheader.  Eg, any undefs here would otherwise be commented out.
+*/
+
+/* Code: */
+
+/* On AIX 3 this must be included before any other include file.  */
+#include <alloca.h>
+#if ! HAVE_ALLOCA
+# error "alloca not available on this machine"
+#endif
+
+#ifdef SIGNAL_H_AHB
+#undef SIGNAL_H_AHB
+#include <signal.h>
+#endif
+
+/* This silences a few compilation warnings on FreeBSD.  */
+#ifdef BSD_SYSTEM_AHB
+#undef BSD_SYSTEM_AHB
+#undef BSD_SYSTEM
+#if __FreeBSD__ == 1
+#define BSD_SYSTEM 199103
+#elif __FreeBSD__ == 2
+#define BSD_SYSTEM 199306
+#elif __FreeBSD__ >= 3
+#define BSD_SYSTEM 199506
+#endif
+#endif
+
+/* Define AMPERSAND_FULL_NAME if you use the convention
+   that & in the full name stands for the login id.  */
+/* Turned on June 1996 supposing nobody will mind it.  */
+#define AMPERSAND_FULL_NAME
+
+/* `subprocesses' should be defined if you want to
+   have code for asynchronous subprocesses
+   (as used in M-x compile and M-x shell).
+   Only MSDOS does not support this (it overrides
+   this in its config_opsysfile below).  */
+
+#define subprocesses
+
+/* Include the os dependent file.  */
+#ifdef config_opsysfile
+# include config_opsysfile
+#endif
+
+/* Mac OS X / GNUstep need a bit more pure memory.  Of the existing knobs,
+   SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.  */
+#ifdef HAVE_NS
+#if defined NS_IMPL_GNUSTEP
+#  define SYSTEM_PURESIZE_EXTRA 30000
+#elif defined DARWIN_OS
+#  define SYSTEM_PURESIZE_EXTRA 200000
+#endif
+#endif
+
+#ifdef emacs /* Don't do this for lib-src.  */
+/* Tell regex.c to use a type compatible with Emacs.  */
+#define RE_TRANSLATE_TYPE Lisp_Object
+#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
+#ifdef make_number
+/* If make_number is a macro, use it.  */
+#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
+#else
+/* If make_number is a function, avoid it.  */
+#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
+#endif
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#if __GNUC__ >= 3  /* On GCC 3.0 we might get a warning.  */
+#define NO_INLINE __attribute__((noinline))
+#else
+#define NO_INLINE
+#endif
+
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
+#define EXTERNALLY_VISIBLE __attribute__((externally_visible))
+#else
+#define EXTERNALLY_VISIBLE
+#endif
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define ATTRIBUTE_FORMAT(spec) /* empty */
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+   ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
+#else
+# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+   ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+#endif
+
+#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
+
+/* Some versions of GNU/Linux define noinline in their headers.  */
+#ifdef noinline
+#undef noinline
+#endif
+
+/* conf_post.h ends here */
diff --git a/src/data.c b/src/data.c
index b23bcbe15b3..fd873b22d4d 100644
--- a/src/data.c
+++ b/src/data.c
@@ -928,7 +928,7 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
         Lisp_Object type = XBUFFER_OBJFWD (valcontents)->slottype;
 
         if (!(NILP (type) || NILP (newval)
-              || (XINT (type) == LISP_INT_TAG
+              || (XINT (type) == Lisp_Int0
                   ? INTEGERP (newval)
                   : XTYPE (newval) == XINT (type))))
           buffer_slot_type_mismatch (newval, XINT (type));
@@ -2522,7 +2522,7 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
   ptrdiff_t ok_args;
   EMACS_INT ok_accum;
 
-  switch (SWITCH_ENUM_CAST (code))
+  switch (code)
     {
     case Alogior:
     case Alogxor:
@@ -2557,7 +2557,7 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
                                    nargs, args);
       args[argnum] = val;
       next = XINT (args[argnum]);
-      switch (SWITCH_ENUM_CAST (code))
+      switch (code)
         {
         case Aadd:
           if (INT_ADD_OVERFLOW (accum, next))
@@ -2643,7 +2643,7 @@ float_arith_driver (double accum, ptrdiff_t argnum, enum arithop code,
           args[argnum] = val;    /* runs into a compiler bug. */
           next = XINT (args[argnum]);
         }
-      switch (SWITCH_ENUM_CAST (code))
+      switch (code)
         {
         case Aadd:
           accum += next;
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 86013d92c07..c1b1310454c 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -261,6 +261,7 @@ xd_symbol_to_dbus_type (Lisp_Object object)
 
 #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus)                               \
   do {                                                                  \
+    char const *session_bus_address = getenv ("DBUS_SESSION_BUS_ADDRESS"); \
     if (STRINGP (bus))                                                  \
       {                                                                 \
         DBusAddressEntry **entries;                                     \
@@ -272,6 +273,11 @@ xd_symbol_to_dbus_type (Lisp_Object object)
         /* Cleanup.  */                                                 \
         dbus_error_free (&derror);                                      \
         dbus_address_entries_free (entries);                            \
+        /* Canonicalize session bus address.  */                        \
+        if ((session_bus_address != NULL)                               \
+            && (!NILP (Fstring_equal                                    \
+                       (bus, build_string (session_bus_address)))))     \
+          bus = QCdbus_session_bus;                                     \
       }                                                                 \
                                                                         \
     else                                                                \
@@ -280,8 +286,7 @@ xd_symbol_to_dbus_type (Lisp_Object object)
         if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) \
           XD_SIGNAL2 (build_string ("Wrong bus name"), bus);            \
         /* We do not want to have an autolaunch for the session bus.  */ \
-        if (EQ (bus, QCdbus_session_bus)                                \
-            && getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL)             \
+        if (EQ (bus, QCdbus_session_bus) && session_bus_address == NULL) \
           XD_SIGNAL2 (build_string ("No connection to bus"), bus);      \
       }                                                                 \
   } while (0)
@@ -981,7 +986,7 @@ static int
 xd_find_watch_fd (DBusWatch *watch)
 {
 #if HAVE_DBUS_WATCH_GET_UNIX_FD
-  /* TODO: Reverse these on Win32, which prefers the opposite.  */
+  /* TODO: Reverse these on w32, which prefers the opposite.  */
   int fd = dbus_watch_get_unix_fd (watch);
   if (fd == -1)
     fd = dbus_watch_get_socket (watch);
@@ -1071,19 +1076,19 @@ xd_close_bus (Lisp_Object bus)
   /* Retrieve bus address.  */
   connection = xd_get_connection_address (bus);
 
-  /* Close connection, if there isn't another shared application.  */
   if (xd_get_connection_references (connection) == 1)
     {
+      /* Close connection, if there isn't another shared application.  */
       XD_DEBUG_MESSAGE ("Close connection to bus %s",
                         XD_OBJECT_TO_STRING (bus));
       dbus_connection_close (connection);
-    }
 
-  /* Decrement reference count.  */
-  dbus_connection_unref (connection);
+      xd_registered_buses = Fdelete (val, xd_registered_buses);
+    }
 
-  /* Remove bus from list of registered buses.  */
-  xd_registered_buses = Fdelete (val, xd_registered_buses);
+  else
+    /* Decrement reference count.  */
+    dbus_connection_unref (connection);
 
   /* Return.  */
   return;
@@ -1124,65 +1129,76 @@ this connection to those buses.  */)
   /* Close bus if it is already open.  */
   xd_close_bus (bus);
 
-  /* Initialize.  */
-  dbus_error_init (&derror);
-
-  /* Open the connection.  */
-  if (STRINGP (bus))
-    if (NILP (private))
-      connection = dbus_connection_open (SSDATA (bus), &derror);
-    else
-      connection = dbus_connection_open_private (SSDATA (bus), &derror);
+  /* Check, whether we are still connected.  */
+  val = Fassoc (bus, xd_registered_buses);
+  if (!NILP (val))
+    {
+      connection = xd_get_connection_address (bus);
+      dbus_connection_ref (connection);
+    }
 
   else
-    if (NILP (private))
-      connection = dbus_bus_get (EQ (bus, QCdbus_system_bus)
-                                 ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION,
-                                 &derror);
-    else
-      connection = dbus_bus_get_private (EQ (bus, QCdbus_system_bus)
-                                         ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION,
-                                         &derror);
-
-  if (dbus_error_is_set (&derror))
-    XD_ERROR (derror);
-
-  if (connection == NULL)
-    XD_SIGNAL2 (build_string ("No connection to bus"), bus);
+    {
+      /* Initialize.  */
+      dbus_error_init (&derror);
 
-  /* If it is not the system or session bus, we must register
-     ourselves.  Otherwise, we have called dbus_bus_get, which has
-     configured us to exit if the connection closes - we undo this
-     setting.  */
-  if (STRINGP (bus))
-    dbus_bus_register (connection, &derror);
-  else
-    dbus_connection_set_exit_on_disconnect (connection, FALSE);
-
-  if (dbus_error_is_set (&derror))
-    XD_ERROR (derror);
-
-  /* Add the watch functions.  We pass also the bus as data, in order
-     to distinguish between the buses in xd_remove_watch.  */
-  if (!dbus_connection_set_watch_functions (connection,
-                                            xd_add_watch,
-                                            xd_remove_watch,
-                                            xd_toggle_watch,
-                                            SYMBOLP (bus)
-                                            ? (void *) XSYMBOL (bus)
-                                            : (void *) XSTRING (bus),
-                                            NULL))
-    XD_SIGNAL1 (build_string ("Cannot add watch functions"));
-
-  /* Add bus to list of registered buses.  */
-  XSETFASTINT (val, (intptr_t) connection);
-  xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses);
-
-  /* We do not want to abort.  */
-  putenv ((char *) "DBUS_FATAL_WARNINGS=0");
+      /* Open the connection.  */
+      if (STRINGP (bus))
+        if (NILP (private))
+          connection = dbus_connection_open (SSDATA (bus), &derror);
+        else
+          connection = dbus_connection_open_private (SSDATA (bus), &derror);
 
-  /* Cleanup.  */
-  dbus_error_free (&derror);
+      else
+        if (NILP (private))
+          connection = dbus_bus_get (EQ (bus, QCdbus_system_bus)
+                                     ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION,
+                                     &derror);
+        else
+          connection = dbus_bus_get_private (EQ (bus, QCdbus_system_bus)
+                                             ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION,
+                                             &derror);
+
+      if (dbus_error_is_set (&derror))
+        XD_ERROR (derror);
+
+      if (connection == NULL)
+        XD_SIGNAL2 (build_string ("No connection to bus"), bus);
+
+      /* If it is not the system or session bus, we must register
+         ourselves.  Otherwise, we have called dbus_bus_get, which has
+         configured us to exit if the connection closes - we undo this
+         setting.  */
+      if (STRINGP (bus))
+        dbus_bus_register (connection, &derror);
+      else
+        dbus_connection_set_exit_on_disconnect (connection, FALSE);
+
+      if (dbus_error_is_set (&derror))
+        XD_ERROR (derror);
+
+      /* Add the watch functions.  We pass also the bus as data, in
+         order to distinguish between the buses in xd_remove_watch.  */
+      if (!dbus_connection_set_watch_functions (connection,
+                                                xd_add_watch,
+                                                xd_remove_watch,
+                                                xd_toggle_watch,
+                                                SYMBOLP (bus)
+                                                ? (void *) XSYMBOL (bus)
+                                                : (void *) XSTRING (bus),
+                                                NULL))
+        XD_SIGNAL1 (build_string ("Cannot add watch functions"));
+
+      /* Add bus to list of registered buses.  */
+      XSETFASTINT (val, (intptr_t) connection);
+      xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses);
+
+      /* We do not want to abort.  */
+      putenv ((char *) "DBUS_FATAL_WARNINGS=0");
+
+      /* Cleanup.  */
+      dbus_error_free (&derror);
+    }
 
   /* Return reference counter.  */
   refcount = xd_get_connection_references (connection);
diff --git a/src/eval.c b/src/eval.c
index a0a05ebf0dc..e6cd4e8dc27 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2094,7 +2094,7 @@ eval_sub (Lisp_Object form)
       args_left = original_args;
       numargs = Flength (args_left);
 
-      CHECK_CONS_LIST ();
+      check_cons_list ();
 
       if (XINT (numargs) < XSUBR (fun)->min_args
           || (XSUBR (fun)->max_args >= 0
@@ -2222,7 +2222,7 @@ eval_sub (Lisp_Object form)
       else
         xsignal1 (Qinvalid_function, original_fun);
     }
-  CHECK_CONS_LIST ();
+  check_cons_list ();
 
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
@@ -2762,7 +2762,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   if (debug_on_next_call)
     do_debug_on_call (Qlambda);
 
-  CHECK_CONS_LIST ();
+  check_cons_list ();
 
   original_fun = args[0];
 
@@ -2871,13 +2871,13 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       else if (EQ (funcar, Qautoload))
         {
           Fautoload_do_load (fun, original_fun, Qnil);
-          CHECK_CONS_LIST ();
+          check_cons_list ();
           goto retry;
         }
       else
         xsignal1 (Qinvalid_function, original_fun);
     }
-  CHECK_CONS_LIST ();
+  check_cons_list ();
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
     val = call_debugger (Fcons (Qexit, Fcons (val, Qnil)));
diff --git a/src/insdel.c b/src/insdel.c
index 2074916cfde..9646507bc4b 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -59,14 +59,10 @@ static Lisp_Object combine_after_change_buffer;
 Lisp_Object Qinhibit_modification_hooks;
 
 static void signal_before_change (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
-
-#define CHECK_MARKERS()                         \
-  do                                            \
-    {                                           \
-      if (check_markers_debug_flag)             \
-        check_markers ();                       \
-    }                                           \
-  while (0)
+
+/* Also used in marker.c to enable expensive marker checks.  */
+
+#ifdef MARKER_DEBUG
 
 static void
 check_markers (void)
@@ -86,7 +82,13 @@ check_markers (void)
         abort ();
     }
 }
-
+
+#else /* not MARKER_DEBUG */
+
+#define check_markers() do { } while (0)
+
+#endif /* MARKER_DEBUG */
+
 /* Move gap to position CHARPOS.
    Note that this can quit!  */
 
@@ -158,8 +160,7 @@ gap_left (ptrdiff_t charpos, ptrdiff_t bytepos, int newgap)
      was specified or may be where a quit was detected.  */
   GPT_BYTE = bytepos;
   GPT = charpos;
-  if (bytepos < charpos)
-    abort ();
+  eassert (charpos <= bytepos);
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
   QUIT;
 }
@@ -209,8 +210,7 @@ gap_right (ptrdiff_t charpos, ptrdiff_t bytepos)
 
   GPT = charpos;
   GPT_BYTE = bytepos;
-  if (bytepos < charpos)
-    abort ();
+  eassert (charpos <= bytepos);
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
   QUIT;
 }
@@ -233,9 +233,7 @@ adjust_markers_for_delete (ptrdiff_t from, ptrdiff_t from_byte,
   for (m = BUF_MARKERS (current_buffer); m; m = m->next)
     {
       charpos = m->charpos;
-
-      if (charpos > Z)
-        abort ();
+      eassert (charpos <= Z);
 
       /* If the marker is after the deletion,
          relocate by number of chars / bytes deleted.  */
@@ -375,7 +373,7 @@ adjust_markers_for_replace (ptrdiff_t from, ptrdiff_t from_byte,
         }
     }
 
-  CHECK_MARKERS ();
+  check_markers ();
 }
 
 
@@ -835,8 +833,7 @@ insert_1_both (const char *string,
   Z_BYTE += nbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   /* The insert may have been in the unchanged region, so check again. */
   if (Z - GPT < END_UNCHANGED)
@@ -856,7 +853,7 @@ insert_1_both (const char *string,
 
   adjust_point (nchars, nbytes);
 
-  CHECK_MARKERS ();
+  check_markers ();
 }
 
 /* Insert the part of the text of STRING, a Lisp object assumed to be
@@ -966,8 +963,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
   Z_BYTE += outgoing_nbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   /* The insert may have been in the unchanged region, so check again. */
   if (Z - GPT < END_UNCHANGED)
@@ -991,7 +987,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
 
   adjust_point (nchars, outgoing_nbytes);
 
-  CHECK_MARKERS ();
+  check_markers ();
 }
 
 /* Insert a sequence of NCHARS chars which occupy NBYTES bytes
@@ -1015,8 +1011,7 @@ insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes)
   Z_BYTE += nbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   adjust_overlays_for_insert (GPT - nchars, nchars);
   adjust_markers_for_insert (GPT - nchars, GPT_BYTE - nbytes,
@@ -1032,7 +1027,7 @@ insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes)
   if (GPT - nchars < PT)
     adjust_point (nchars, nbytes);
 
-  CHECK_MARKERS ();
+  check_markers ();
 }
 
 /* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
@@ -1151,8 +1146,7 @@ insert_from_buffer_1 (struct buffer *buf,
   Z_BYTE += outgoing_nbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   /* The insert may have been in the unchanged region, so check again. */
   if (Z - GPT < END_UNCHANGED)
@@ -1243,7 +1237,7 @@ adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte,
   if (Z - GPT < END_UNCHANGED)
     END_UNCHANGED = Z - GPT;
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   if (len == 0)
     evaporate_overlays (from);
@@ -1296,7 +1290,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   ptrdiff_t outgoing_insbytes = insbytes;
   Lisp_Object deletion;
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   GCPRO1 (new);
   deletion = Qnil;
@@ -1357,8 +1351,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   GPT_BYTE = from_byte;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   if (GPT - BEG < BEG_UNCHANGED)
     BEG_UNCHANGED = GPT - BEG;
@@ -1404,8 +1397,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   Z_BYTE += outgoing_insbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   /* Adjust the overlay center as needed.  This must be done after
      adjusting the markers that bound the overlays.  */
@@ -1435,7 +1427,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   if (outgoing_insbytes == 0)
     evaporate_overlays (from);
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   MODIFF++;
   CHARS_MODIFF = MODIFF;
@@ -1465,7 +1457,7 @@ replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
 {
   ptrdiff_t nbytes_del, nchars_del;
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   nchars_del = to - from;
   nbytes_del = to_byte - from_byte;
@@ -1488,8 +1480,7 @@ replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
   GPT_BYTE = from_byte;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   if (GPT - BEG < BEG_UNCHANGED)
     BEG_UNCHANGED = GPT - BEG;
@@ -1522,8 +1513,7 @@ replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
   Z_BYTE += insbytes;
   if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor.  */
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   /* Adjust the overlay center as needed.  This must be done after
      adjusting the markers that bound the overlays.  */
@@ -1554,7 +1544,7 @@ replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
   if (insbytes == 0)
     evaporate_overlays (from);
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   MODIFF++;
   CHARS_MODIFF = MODIFF;
@@ -1705,7 +1695,7 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
   register ptrdiff_t nbytes_del, nchars_del;
   Lisp_Object deletion;
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   nchars_del = to - from;
   nbytes_del = to_byte - from_byte;
@@ -1761,15 +1751,14 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
        needs to access the previous gap contents.  */
     *(GPT_ADDR) = 0;
 
-  if (GPT_BYTE < GPT)
-    abort ();
+  eassert (GPT <= GPT_BYTE);
 
   if (GPT - BEG < BEG_UNCHANGED)
     BEG_UNCHANGED = GPT - BEG;
   if (Z - GPT < END_UNCHANGED)
     END_UNCHANGED = Z - GPT;
 
-  CHECK_MARKERS ();
+  check_markers ();
 
   evaporate_overlays (from);
 
@@ -2201,9 +2190,6 @@ syms_of_insdel (void)
   combine_after_change_list = Qnil;
   combine_after_change_buffer = Qnil;
 
-  DEFVAR_BOOL ("check-markers-debug-flag", check_markers_debug_flag,
-               doc: /* Non-nil means enable debugging checks for invalid marker positions.  */);
-  check_markers_debug_flag = 0;
   DEFVAR_LISP ("combine-after-change-calls", Vcombine_after_change_calls,
                doc: /* Used internally by the `combine-after-change-calls' macro.  */);
   Vcombine_after_change_calls = Qnil;
diff --git a/src/keyboard.c b/src/keyboard.c
index bfbfdf2b984..3b30f4c1b2d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2188,14 +2188,7 @@ show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
   if (!NILP (help) && !STRINGP (help))
     {
       if (FUNCTIONP (help))
-        {
-          Lisp_Object args[4];
-          args[0] = help;
-          args[1] = window;
-          args[2] = object;
-          args[3] = pos;
-          help = safe_call (4, args);
-        }
+        help = safe_call (4, help, window, object, pos);
       else
         help = safe_eval (help);
 
@@ -5336,7 +5329,7 @@ make_lispy_event (struct input_event *event)
 {
   int i;
 
-  switch (SWITCH_ENUM_CAST (event->kind))
+  switch (event->kind)
     {
       /* A simple keystroke.  */
     case ASCII_KEYSTROKE_EVENT:
diff --git a/src/keymap.c b/src/keymap.c
index feaf0cfd961..3c5d45b0680 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2141,7 +2141,7 @@ The `kbd' macro is an approximate inverse of this.  */)
                 continue;
             }
           else
-            XSETINT (key, (XINT (key) | meta_modifier) & ~0x80);
+            XSETINT (key, XINT (key) | meta_modifier);
           add_meta = 0;
         }
       else if (EQ (key, meta_prefix_char))
@@ -3702,13 +3702,12 @@ syms_of_keymap (void)
   Fset (intern_c_string ("ctl-x-map"), control_x_map);
   Ffset (intern_c_string ("Control-X-prefix"), control_x_map);
 
-  exclude_keys
-    = pure_cons (pure_cons (build_pure_c_string ("DEL"), build_pure_c_string ("\\d")),
-                 pure_cons (pure_cons (build_pure_c_string ("TAB"), build_pure_c_string ("\\t")),
-                    pure_cons (pure_cons (build_pure_c_string ("RET"), build_pure_c_string ("\\r")),
-                           pure_cons (pure_cons (build_pure_c_string ("ESC"), build_pure_c_string ("\\e")),
-                                  pure_cons (pure_cons (build_pure_c_string ("SPC"), build_pure_c_string (" ")),
-                                         Qnil)))));
+  exclude_keys = listn (CONSTYPE_PURE, 5,
+                        pure_cons (build_pure_c_string ("DEL"), build_pure_c_string ("\\d")),
+                        pure_cons (build_pure_c_string ("TAB"), build_pure_c_string ("\\t")),
+                        pure_cons (build_pure_c_string ("RET"), build_pure_c_string ("\\r")),
+                        pure_cons (build_pure_c_string ("ESC"), build_pure_c_string ("\\e")),
+                        pure_cons (build_pure_c_string ("SPC"), build_pure_c_string (" ")));
   staticpro (&exclude_keys);
 
   DEFVAR_LISP ("define-key-rebound-commands", Vdefine_key_rebound_commands,
@@ -3761,16 +3760,16 @@ be preferred.  */);
   where_is_preferred_modifier = 0;
 
   staticpro (&Vmouse_events);
-  Vmouse_events = pure_cons (intern_c_string ("menu-bar"),
-                  pure_cons (intern_c_string ("tool-bar"),
-                  pure_cons (intern_c_string ("header-line"),
-                  pure_cons (intern_c_string ("mode-line"),
-                  pure_cons (intern_c_string ("mouse-1"),
-                  pure_cons (intern_c_string ("mouse-2"),
-                  pure_cons (intern_c_string ("mouse-3"),
-                  pure_cons (intern_c_string ("mouse-4"),
-                  pure_cons (intern_c_string ("mouse-5"),
-                             Qnil)))))))));
+  Vmouse_events = listn (CONSTYPE_PURE, 9,
+                         intern_c_string ("menu-bar"),
+                         intern_c_string ("tool-bar"),
+                         intern_c_string ("header-line"),
+                         intern_c_string ("mode-line"),
+                         intern_c_string ("mouse-1"),
+                         intern_c_string ("mouse-2"),
+                         intern_c_string ("mouse-3"),
+                         intern_c_string ("mouse-4"),
+                         intern_c_string ("mouse-5"));
 
   DEFSYM (Qsingle_key_description, "single-key-description");
   DEFSYM (Qkey_description, "key-description");
diff --git a/src/lisp.h b/src/lisp.h
index e371e0a8049..3fe5cc911df 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_LISP_H
 #define EMACS_LISP_H
 
+#include <stdalign.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <inttypes.h>
@@ -27,19 +28,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <intprops.h>
 
-/* Use the configure flag --enable-checking[=LIST] to enable various
-   types of run time checks for Lisp objects.  */
-
-#ifdef GC_CHECK_CONS_LIST
-extern void check_cons_list (void);
-#define CHECK_CONS_LIST() check_cons_list ()
-#else
-#define CHECK_CONS_LIST() ((void) 0)
-#endif
-
-/* Temporarily disable wider-than-pointer integers until they're tested more.
-   Build with CFLAGS='-DWIDE_EMACS_INT' to try them out.  */
-/* #undef WIDE_EMACS_INT */
+/* The ubiquitous max and min macros.  */
+#undef min
+#undef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#define min(a, b) ((a) < (b) ? (a) : (b))
 
 /* EMACS_INT - signed integer wide enough to hold an Emacs value
    EMACS_INT_MAX - maximum value of EMACS_INT; can be used in #if
@@ -64,12 +57,6 @@ typedef unsigned int EMACS_UINT;
 # endif
 #endif
 
-/* If an enum type is not used, the enum symbols are not put into the
-   executable so the debugger cannot see them on many systems, e.g.,
-   GCC 4.7.1 + GDB 7.4.1 + GNU/Linux.  Work around this problem by
-   explicitly using the names in the integer constant expression EXPR.  */
-#define PUBLISH_TO_GDB(expr) extern int (*gdb_dummy (int))[(expr) || 1]
-
 /* Number of bits in some machine integer types.  */
 enum
   {
@@ -157,49 +144,46 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
    on the few static Lisp_Objects used: all the defsubr as well
    as the two special buffers buffer_defaults and buffer_local_symbols.  */
 
-/* First, try and define DECL_ALIGN(type,var) which declares a static
-   variable VAR of type TYPE with the added requirement that it be
-   TYPEBITS-aligned.  */
-
-/* Number of bits in a Lisp_Object tag.  This can be used in #if,
-   and for GDB's sake also as a regular symbol.  */
-enum { GCTYPEBITS = 3 };
-PUBLISH_TO_GDB (GCTYPEBITS);
+enum Lisp_Bits
+  {
+    /* Number of bits in a Lisp_Object tag.  This can be used in #if,
+       and for GDB's sake also as a regular symbol.  */
+    GCTYPEBITS =
 #define GCTYPEBITS 3
+        GCTYPEBITS,
+
+    /* 2**GCTYPEBITS.  This must also be a macro that expands to a
+       literal integer constant, for MSVC.  */
+    GCALIGNMENT =
+#define GCALIGNMENT 8
+        GCALIGNMENT,
 
-/* Number of bits in a Lisp_Object value, not counting the tag.  */
-enum { VALBITS = BITS_PER_EMACS_INT - GCTYPEBITS };
+    /* Number of bits in a Lisp_Object value, not counting the tag.  */
+    VALBITS = BITS_PER_EMACS_INT - GCTYPEBITS,
+
+    /* Number of bits in a Lisp fixnum tag.  */
+    INTTYPEBITS = GCTYPEBITS - 1,
+
+    /* Number of bits in a Lisp fixnum value, not counting the tag.  */
+    FIXNUM_BITS = VALBITS + 1
+  };
+
+#if GCALIGNMENT != 1 << GCTYPEBITS
+# error "GCALIGNMENT and GCTYPEBITS are inconsistent"
+#endif
 
 /* The maximum value that can be stored in a EMACS_INT, assuming all
    bits other than the type bits contribute to a nonnegative signed value.
    This can be used in #if, e.g., '#if VAL_MAX < UINTPTR_MAX' below.  */
 #define VAL_MAX (EMACS_INT_MAX >> (GCTYPEBITS - 1))
 
-#ifndef NO_DECL_ALIGN
-# ifndef DECL_ALIGN
-#  if HAVE_ATTRIBUTE_ALIGNED
-#   define DECL_ALIGN(type, var) \
-     type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var
-#  elif defined(_MSC_VER)
-#   define ALIGN_GCTYPEBITS 8
-#   if (1 << GCTYPEBITS) != ALIGN_GCTYPEBITS
-#    error ALIGN_GCTYPEBITS is wrong!
-#   endif
-#   define DECL_ALIGN(type, var) \
-     type __declspec(align(ALIGN_GCTYPEBITS)) var
-#  else
-     /* What directives do other compilers use?  */
-#  endif
-# endif
-#endif
-
 /* Unless otherwise specified, use USE_LSB_TAG on systems where:  */
 #ifndef USE_LSB_TAG
 /* 1.  We know malloc returns a multiple of 8.  */
 # if (defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ \
       || defined DARWIN_OS || defined __sun)
 /* 2.  We can specify multiple-of-8 alignment on static variables.  */
-#  ifdef DECL_ALIGN
+#  ifdef alignas
 /* 3.  Pointers-as-ints exceed VAL_MAX.
    On hosts where pointers-as-ints do not exceed VAL_MAX, USE_LSB_TAG is:
     a. unnecessary, because the top bits of an EMACS_INT are unused, and
@@ -211,25 +195,20 @@ enum { VALBITS = BITS_PER_EMACS_INT - GCTYPEBITS };
 #  endif
 # endif
 #endif
-/* USE_LSB_TAG can be used in #if; default it to 0 and make it visible
-   to GDB.  */
 #ifdef USE_LSB_TAG
 # undef USE_LSB_TAG
-enum { USE_LSB_TAG = 1 };
-PUBLISH_TO_GDB (USE_LSB_TAG);
+enum enum_USE_LSB_TAG { USE_LSB_TAG = 1 };
 # define USE_LSB_TAG 1
 #else
-enum { USE_LSB_TAG = 0 };
-PUBLISH_TO_GDB (USE_LSB_TAG);
+enum enum_USE_LSB_TAG { USE_LSB_TAG = 0 };
 # define USE_LSB_TAG 0
 #endif
 
-/* If we cannot use 8-byte alignment, make DECL_ALIGN a no-op.  */
-#ifndef DECL_ALIGN
+#ifndef alignas
+# define alignas(alignment) /* empty */
 # if USE_LSB_TAG
-#  error "USE_LSB_TAG used without defining DECL_ALIGN"
+#  error "USE_LSB_TAG requires alignas"
 # endif
-# define DECL_ALIGN(type, var) type var
 #endif
 
 
@@ -239,14 +218,9 @@ PUBLISH_TO_GDB (USE_LSB_TAG);
 
 /* Lisp integers use 2 tags, to give them one extra bit, thus
    extending their range from, e.g., -2^28..2^28-1 to -2^29..2^29-1.  */
-enum { INTTYPEBITS = GCTYPEBITS - 1 };
-enum { FIXNUM_BITS = VALBITS + 1 };
-#define INTMASK (EMACS_INT_MAX >> (INTTYPEBITS - 1))
-#define LISP_INT_TAG Lisp_Int0
+static EMACS_INT const INTMASK = EMACS_INT_MAX >> (INTTYPEBITS - 1);
 #define case_Lisp_Int case Lisp_Int0: case Lisp_Int1
-#define LISP_INT1_TAG (USE_LSB_TAG ? 1 << INTTYPEBITS : 1)
-#define LISP_STRING_TAG (5 - LISP_INT1_TAG)
-#define LISP_INT_TAG_P(x) (((x) & ~LISP_INT1_TAG) == 0)
+#define LISP_INT_TAG_P(x) (((x) & ~Lisp_Int1) == 0)
 
 /* Stolen from GDB.  The only known compiler that doesn't support
    enums in bitfields is MSVC.  */
@@ -261,7 +235,7 @@ enum Lisp_Type
   {
     /* Integer.  XINT (obj) is the integer value.  */
     Lisp_Int0 = 0,
-    Lisp_Int1 = LISP_INT1_TAG,
+    Lisp_Int1 = USE_LSB_TAG ? 1 << INTTYPEBITS : 1,
 
     /* Symbol.  XSYMBOL (object) points to a struct Lisp_Symbol.  */
     Lisp_Symbol = 2,
@@ -272,7 +246,7 @@ enum Lisp_Type
 
     /* String.  XSTRING (object) points to a struct Lisp_String.
        The length of the string, and its contents, are stored therein.  */
-    Lisp_String = LISP_STRING_TAG,
+    Lisp_String = USE_LSB_TAG ? 1 : 1 << INTTYPEBITS,
 
     /* Vector of Lisp objects, or something resembling it.
        XVECTOR (object) points to a struct Lisp_Vector, which contains
@@ -335,9 +309,9 @@ LISP_MAKE_RVALUE (Lisp_Object o)
 }
 
 #define LISP_INITIALLY_ZERO {0}
-#undef CHECK_LISP_OBJECT_TYPE
-enum { CHECK_LISP_OBJECT_TYPE = 1 };
 
+#undef CHECK_LISP_OBJECT_TYPE
+enum CHECK_LISP_OBJECT_TYPE { CHECK_LISP_OBJECT_TYPE = 1 };
 #else /* CHECK_LISP_OBJECT_TYPE */
 
 /* If a struct type is not wanted, define Lisp_Object as just a number.  */
@@ -347,17 +321,16 @@ typedef EMACS_INT Lisp_Object;
 #define XIL(i) (i)
 #define LISP_MAKE_RVALUE(o) (0+(o))
 #define LISP_INITIALLY_ZERO 0
-enum { CHECK_LISP_OBJECT_TYPE = 0 };
+enum CHECK_LISP_OBJECT_TYPE { CHECK_LISP_OBJECT_TYPE = 0 };
 #endif /* CHECK_LISP_OBJECT_TYPE */
-PUBLISH_TO_GDB (CHECK_LISP_OBJECT_TYPE);
 
 /* In the size word of a vector, this bit means the vector has been marked.  */
 
-#define ARRAY_MARK_FLAG PTRDIFF_MIN
+static ptrdiff_t const ARRAY_MARK_FLAG = PTRDIFF_MIN;
 
 /* In the size word of a struct Lisp_Vector, this bit means it's really
    some other vector-like object.  */
-#define PSEUDOVECTOR_FLAG (PTRDIFF_MAX - PTRDIFF_MAX / 2)
+static ptrdiff_t const PSEUDOVECTOR_FLAG = PTRDIFF_MAX - PTRDIFF_MAX / 2;
 
 /* In a pseudovector, the size field actually contains a word with one
    PSEUDOVECTOR_FLAG bit set, and exactly one of the following bits to
@@ -394,35 +367,32 @@ enum pvec_type
   PVEC_SUB_CHAR_TABLE           = 0x30,
   PVEC_FONT                     = 0x40
 };
-PUBLISH_TO_GDB ((enum pvec_type) 0);  /* This also publishes PVEC_*.  */
 
-/* For convenience, we also store the number of elements in these bits.
-   Note that this size is not necessarily the memory-footprint size, but
-   only the number of Lisp_Object fields (that need to be traced by the GC).
-   The distinction is used e.g. by Lisp_Process which places extra
-   non-Lisp_Object fields at the end of the structure.  */
-enum
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
+   which were stored in a Lisp_Object.  */
+#ifndef DATA_SEG_BITS
+# define DATA_SEG_BITS 0
+#endif
+enum { gdb_DATA_SEG_BITS = DATA_SEG_BITS };
+#undef DATA_SEG_BITS
+
+enum More_Lisp_Bits
   {
+    DATA_SEG_BITS = gdb_DATA_SEG_BITS,
+
+    /* For convenience, we also store the number of elements in these bits.
+       Note that this size is not necessarily the memory-footprint size, but
+       only the number of Lisp_Object fields (that need to be traced by GC).
+       The distinction is used, e.g., by Lisp_Process, which places extra
+       non-Lisp_Object fields at the end of the structure.  */
     PSEUDOVECTOR_SIZE_BITS = 16,
     PSEUDOVECTOR_SIZE_MASK = (1 << PSEUDOVECTOR_SIZE_BITS) - 1,
-    PVEC_TYPE_MASK = 0x0fff << PSEUDOVECTOR_SIZE_BITS
-  };
-
-/* Number of bits to put in each character in the internal representation
-   of bool vectors.  This should not vary across implementations.  */
-enum { BOOL_VECTOR_BITS_PER_CHAR = 8 };
+    PVEC_TYPE_MASK = 0x0fff << PSEUDOVECTOR_SIZE_BITS,
 
-/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
-   which were stored in a Lisp_Object.  It is not needed in #if, so
-   for GDB's sake change it from a macro to a regular symbol.  */
-#ifdef DATA_SEG_BITS
-enum { gdb_DATA_SEG_BITS = DATA_SEG_BITS };
-# undef DATA_SEG_BITS
-enum { DATA_SEG_BITS = gdb_DATA_SEG_BITS };
-#else
-enum { DATA_SEG_BITS = 0 };
-#endif
-PUBLISH_TO_GDB (DATA_SEG_BITS);
+    /* Number of bits to put in each character in the internal representation
+       of bool vectors.  This should not vary across implementations.  */
+    BOOL_VECTOR_BITS_PER_CHAR = 8
+  };
 
 /* These macros extract various sorts of values from a Lisp_Object.
  For example, if tem is a Lisp_Object whose type is Lisp_Cons,
@@ -433,8 +403,11 @@ PUBLISH_TO_GDB (DATA_SEG_BITS);
 
 #if USE_LSB_TAG
 
-#define VALMASK (-1 << GCTYPEBITS)
-#define TYPEMASK ((1 << GCTYPEBITS) - 1)
+enum lsb_bits
+  {
+    TYPEMASK = (1 << GCTYPEBITS) - 1,
+    VALMASK = ~ TYPEMASK
+  };
 #define XTYPE(a) ((enum Lisp_Type) (XLI (a) & TYPEMASK))
 #define XINT(a) (XLI (a) >> INTTYPEBITS)
 #define XUINT(a) ((EMACS_UINT) XLI (a) >> INTTYPEBITS)
@@ -448,7 +421,7 @@ PUBLISH_TO_GDB (DATA_SEG_BITS);
 
 #else  /* not USE_LSB_TAG */
 
-#define VALMASK VAL_MAX
+static EMACS_INT const VALMASK = VAL_MAX;
 
 #define XTYPE(a) ((enum Lisp_Type) ((EMACS_UINT) XLI (a) >> VALBITS))
 
@@ -496,9 +469,14 @@ PUBLISH_TO_GDB (DATA_SEG_BITS);
 #define EQ(x, y) (XHASH (x) == XHASH (y))
 
 /* Largest and smallest representable fixnum values.  These are the C
-   values.  */
+   values.  They are macros for use in static initializers, and
+   constants for visibility to GDB.  */
+static EMACS_INT const MOST_POSITIVE_FIXNUM =
 #define MOST_POSITIVE_FIXNUM (EMACS_INT_MAX >> INTTYPEBITS)
+        MOST_POSITIVE_FIXNUM;
+static EMACS_INT const MOST_NEGATIVE_FIXNUM =
 #define MOST_NEGATIVE_FIXNUM (-1 - MOST_POSITIVE_FIXNUM)
+        MOST_NEGATIVE_FIXNUM;
 
 /* Value is non-zero if I doesn't fit into a Lisp fixnum.  It is
    written this way so that it also works if I is of unsigned
@@ -666,21 +644,12 @@ struct Lisp_Cons
   {
     /* Please do not use the names of these elements in code other
        than the core lisp implementation.  Use XCAR and XCDR below.  */
-#ifdef HIDE_LISP_IMPLEMENTATION
-    Lisp_Object car_;
-    union
-    {
-      Lisp_Object cdr_;
-      struct Lisp_Cons *chain;
-    } u;
-#else
     Lisp_Object car;
     union
     {
       Lisp_Object cdr;
       struct Lisp_Cons *chain;
     } u;
-#endif
   };
 
 /* Take the car or cdr of something known to be a cons cell.  */
@@ -690,13 +659,8 @@ struct Lisp_Cons
    fields are not accessible as lvalues.  (What if we want to switch to
    a copying collector someday?  Cached cons cell field addresses may be
    invalidated at arbitrary points.)  */
-#ifdef HIDE_LISP_IMPLEMENTATION
-#define XCAR_AS_LVALUE(c) (XCONS ((c))->car_)
-#define XCDR_AS_LVALUE(c) (XCONS ((c))->u.cdr_)
-#else
 #define XCAR_AS_LVALUE(c) (XCONS ((c))->car)
 #define XCDR_AS_LVALUE(c) (XCONS ((c))->u.cdr)
-#endif
 
 /* Use these from normal code.  */
 #define XCAR(c) LISP_MAKE_RVALUE (XCAR_AS_LVALUE (c))
@@ -757,10 +721,15 @@ extern ptrdiff_t string_bytes (struct Lisp_String *);
    Although the actual size limit (see STRING_BYTES_MAX in alloc.c)
    may be a bit smaller than STRING_BYTES_BOUND, calculating it here
    would expose alloc.c internal details that we'd rather keep
-   private.  The cast to ptrdiff_t ensures that STRING_BYTES_BOUND is
-   signed.  */
+   private.
+
+   This is a macro for use in static initializers, and a constant for
+   visibility to GDB.  The cast to ptrdiff_t ensures that
+   the macro is signed.  */
+static ptrdiff_t const STRING_BYTES_BOUND =
 #define STRING_BYTES_BOUND  \
-  min (MOST_POSITIVE_FIXNUM, (ptrdiff_t) min (SIZE_MAX, PTRDIFF_MAX) - 1)
+  ((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, min (SIZE_MAX, PTRDIFF_MAX) - 1))
+        STRING_BYTES_BOUND;
 
 /* Mark STR as a unibyte string.  */
 #define STRING_SET_UNIBYTE(STR)  \
@@ -869,16 +838,6 @@ struct Lisp_Vector
    of a char-table, and there's no way to access it directly from
    Emacs Lisp program.  */
 
-/* This is the number of slots that every char table must have.  This
-   counts the ordinary slots and the top, defalt, parent, and purpose
-   slots.  */
-#define CHAR_TABLE_STANDARD_SLOTS (VECSIZE (struct Lisp_Char_Table) - 1)
-
-/* Return the number of "extra" slots in the char table CT.  */
-
-#define CHAR_TABLE_EXTRA_SLOTS(CT)      \
-  (((CT)->header.size & PSEUDOVECTOR_SIZE_MASK) - CHAR_TABLE_STANDARD_SLOTS)
-
 #ifdef __GNUC__
 
 #define CHAR_TABLE_REF_ASCII(CT, IDX)                                   \
@@ -940,10 +899,13 @@ struct Lisp_Vector
    ? XSUB_CHAR_TABLE (XCHAR_TABLE (CT)->ascii)->contents[IDX] = VAL     \
    : char_table_set (CT, IDX, VAL))
 
-#define CHARTAB_SIZE_BITS_0 6
-#define CHARTAB_SIZE_BITS_1 4
-#define CHARTAB_SIZE_BITS_2 5
-#define CHARTAB_SIZE_BITS_3 7
+enum CHARTAB_SIZE_BITS
+  {
+    CHARTAB_SIZE_BITS_0 = 6,
+    CHARTAB_SIZE_BITS_1 = 4,
+    CHARTAB_SIZE_BITS_2 = 5,
+    CHARTAB_SIZE_BITS_3 = 7
+  };
 
 extern const int chartab_size[4];
 
@@ -1042,6 +1004,19 @@ struct Lisp_Subr
     const char *doc;
   };
 
+/* This is the number of slots that every char table must have.  This
+   counts the ordinary slots and the top, defalt, parent, and purpose
+   slots.  */
+enum CHAR_TABLE_STANDARD_SLOTS
+  {
+    CHAR_TABLE_STANDARD_SLOTS = VECSIZE (struct Lisp_Char_Table) - 1
+  };
+
+/* Return the number of "extra" slots in the char table CT.  */
+
+#define CHAR_TABLE_EXTRA_SLOTS(CT)      \
+  (((CT)->header.size & PSEUDOVECTOR_SIZE_MASK) - CHAR_TABLE_STANDARD_SLOTS)
+
 
 /***********************************************************************
                                Symbols
@@ -1269,7 +1244,7 @@ struct Lisp_Hash_Table
 
 /* Default size for hash tables if not specified.  */
 
-#define DEFAULT_HASH_SIZE 65
+enum DEFAULT_HASH_SIZE { DEFAULT_HASH_SIZE = 65 };
 
 /* Default threshold specifying when to resize a hash table.  The
    value gives the ratio of current entries in the hash table and the
@@ -1509,23 +1484,13 @@ struct Lisp_Float
   {
     union
     {
-#ifdef HIDE_LISP_IMPLEMENTATION
-      double data_;
-#else
       double data;
-#endif
       struct Lisp_Float *chain;
     } u;
   };
 
-#ifdef HIDE_LISP_IMPLEMENTATION
-#define XFLOAT_DATA(f)  (0 ? XFLOAT (f)->u.data_ : XFLOAT (f)->u.data_)
-#else
-#define XFLOAT_DATA(f)  (0 ? XFLOAT (f)->u.data :  XFLOAT (f)->u.data)
-/* This should be used only in alloc.c, which always disables
-   HIDE_LISP_IMPLEMENTATION.  */
-#define XFLOAT_INIT(f,n) (XFLOAT (f)->u.data = (n))
-#endif
+#define XFLOAT_DATA(f) (0 ? XFLOAT (f)->u.data :  XFLOAT (f)->u.data)
+#define XFLOAT_INIT(f, n) (XFLOAT (f)->u.data = (n))
 
 /* A character, declared with the following typedef, is a member
    of some character set associated with the current buffer.  */
@@ -1536,31 +1501,38 @@ typedef unsigned char UCHAR;
 
 /* Meanings of slots in a Lisp_Compiled:  */
 
-#define COMPILED_ARGLIST 0
-#define COMPILED_BYTECODE 1
-#define COMPILED_CONSTANTS 2
-#define COMPILED_STACK_DEPTH 3
-#define COMPILED_DOC_STRING 4
-#define COMPILED_INTERACTIVE 5
+enum Lisp_Compiled
+  {
+    COMPILED_ARGLIST = 0,
+    COMPILED_BYTECODE = 1,
+    COMPILED_CONSTANTS = 2,
+    COMPILED_STACK_DEPTH = 3,
+    COMPILED_DOC_STRING = 4,
+    COMPILED_INTERACTIVE = 5
+  };
 
 /* Flag bits in a character.  These also get used in termhooks.h.
    Richard Stallman <rms@gnu.ai.mit.edu> thinks that MULE
    (MUlti-Lingual Emacs) might need 22 bits for the character value
    itself, so we probably shouldn't use any bits lower than 0x0400000.  */
-#define CHAR_ALT   (0x0400000)
-#define CHAR_SUPER (0x0800000)
-#define CHAR_HYPER (0x1000000)
-#define CHAR_SHIFT (0x2000000)
-#define CHAR_CTL   (0x4000000)
-#define CHAR_META  (0x8000000)
-
-#define CHAR_MODIFIER_MASK \
-  (CHAR_ALT | CHAR_SUPER | CHAR_HYPER  | CHAR_SHIFT | CHAR_CTL | CHAR_META)
+enum char_bits
+  {
+    CHAR_ALT = 0x0400000,
+    CHAR_SUPER = 0x0800000,
+    CHAR_HYPER = 0x1000000,
+    CHAR_SHIFT = 0x2000000,
+    CHAR_CTL = 0x4000000,
+    CHAR_META = 0x8000000,
+
+    CHAR_MODIFIER_MASK =
+      CHAR_ALT | CHAR_SUPER | CHAR_HYPER | CHAR_SHIFT | CHAR_CTL | CHAR_META,
+
+    /* Actually, the current Emacs uses 22 bits for the character value
+       itself.  */
+    CHARACTERBITS = 22
+  };
 
 
-/* Actually, the current Emacs uses 22 bits for the character value
-   itself.  */
-#define CHARACTERBITS 22
 
 
 /* The glyph datatype, used to represent characters on the display.
@@ -1617,9 +1589,6 @@ typedef struct {
                    (XINT (gc) >> CHARACTERBITS));                       \
     }                                                                   \
   while (0)
-
-/* The ID of the mode line highlighting face.  */
-#define GLYPH_MODE_LINE_FACE 1
 
 /* Structure to hold mouse highlight data.  This is here because other
    header files need it for defining struct x_output etc.  */
@@ -1894,7 +1863,7 @@ typedef struct {
 #ifdef _MSC_VER
 #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)     \
    Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                          \
-   static DECL_ALIGN (struct Lisp_Subr, sname) =                        \
+   static struct Lisp_Subr alignas (GCALIGNMENT) sname =                \
    { (PVEC_SUBR << PSEUDOVECTOR_SIZE_BITS)                              \
      | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)),                \
       { (Lisp_Object (__cdecl *)(void))fnname },                        \
@@ -1903,7 +1872,7 @@ typedef struct {
 #else  /* not _MSC_VER */
 #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)     \
    Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                          \
-   static DECL_ALIGN (struct Lisp_Subr, sname) =                        \
+   static struct Lisp_Subr alignas (GCALIGNMENT) sname =                \
      { PVEC_SUBR << PSEUDOVECTOR_SIZE_BITS,                             \
       { .a ## maxargs = fnname },                                       \
        minargs, maxargs, lname, intspec, 0};                            \
@@ -1939,8 +1908,11 @@ typedef struct {
    is how we define the symbol for function `name' at start-up time.  */
 extern void defsubr (struct Lisp_Subr *);
 
-#define MANY -2
-#define UNEVALLED -1
+enum maxargs
+  {
+    MANY = -2,
+    UNEVALLED = -1
+  };
 
 extern void defvar_lisp (struct Lisp_Objfwd *, const char *, Lisp_Object *);
 extern void defvar_lisp_nopro (struct Lisp_Objfwd *, const char *, Lisp_Object *);
@@ -2655,6 +2627,8 @@ extern Lisp_Object list3 (Lisp_Object, Lisp_Object, Lisp_Object);
 extern Lisp_Object list4 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
 extern Lisp_Object list5 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object,
                           Lisp_Object);
+enum constype {CONSTYPE_HEAP, CONSTYPE_PURE};
+extern Lisp_Object listn (enum constype, ptrdiff_t, Lisp_Object, ...);
 extern _Noreturn void string_overflow (void);
 extern Lisp_Object make_string (const char *, ptrdiff_t);
 extern Lisp_Object make_formatted_string (char *, const char *, ...)
@@ -2724,6 +2698,11 @@ extern void init_alloc (void);
 extern void syms_of_alloc (void);
 extern struct buffer * allocate_buffer (void);
 extern int valid_lisp_object_p (Lisp_Object);
+#ifdef GC_CHECK_CONS_LIST
+extern void check_cons_list (void);
+#else
+#define check_cons_list() ((void) 0)
+#endif
 
 #ifdef REL_ALLOC
 /* Defined in ralloc.c */
@@ -2766,7 +2745,7 @@ extern void print_error_message (Lisp_Object, Lisp_Object, const char *,
                                  Lisp_Object);
 extern Lisp_Object internal_with_output_to_temp_buffer
         (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
-#define FLOAT_TO_STRING_BUFSIZE 350
+enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
 extern int float_to_string (char *, double);
 extern void syms_of_print (void);
 
@@ -2871,7 +2850,7 @@ extern _Noreturn void verror (const char *, va_list)
   ATTRIBUTE_FORMAT_PRINTF (1, 0);
 extern Lisp_Object un_autoload (Lisp_Object);
 extern void init_eval_once (void);
-extern Lisp_Object safe_call (ptrdiff_t, Lisp_Object *);
+extern Lisp_Object safe_call (ptrdiff_t, Lisp_Object, ...);
 extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object);
 extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object);
 extern void init_eval (void);
@@ -3330,7 +3309,7 @@ extern void init_system_name (void);
    in addition to a device separator.  Set the path separator
    to '/', and don't test for a device separator in IS_ANY_SEP.  */
 
-#define DIRECTORY_SEP '/'
+static char const DIRECTORY_SEP = '/';
 #ifndef IS_DIRECTORY_SEP
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
 #endif
@@ -3345,8 +3324,6 @@ extern void init_system_name (void);
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
 #endif
 
-#define SWITCH_ENUM_CAST(x) (x)
-
 /* Use this to suppress gcc's warnings.  */
 #ifdef lint
 
@@ -3362,15 +3339,6 @@ extern void init_system_name (void);
 # define lint_assume(cond) ((void) (0 && (cond)))
 #endif
 
-/* The ubiquitous min and max macros.  */
-
-#ifdef max
-#undef max
-#undef min
-#endif
-#define min(a, b)       ((a) < (b) ? (a) : (b))
-#define max(a, b)       ((a) > (b) ? (a) : (b))
-
 /* We used to use `abs', but that clashes with system headers on some
    platforms, and using a name reserved by Standard C is a bad idea
    anyway.  */
@@ -3413,7 +3381,7 @@ extern void init_system_name (void);
 /* SAFE_ALLOCA normally allocates memory on the stack, but if size is
    larger than MAX_ALLOCA, use xmalloc to avoid overflowing the stack.  */
 
-#define MAX_ALLOCA 16*1024
+enum MAX_ALLOCA { MAX_ALLOCA = 16*1024 };
 
 extern Lisp_Object safe_alloca_unwind (Lisp_Object);
 
diff --git a/src/lread.c b/src/lread.c
index 39378bb11dd..0db37d7492f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4121,12 +4121,7 @@ init_lread (void)
    difference between initialized and !initialized in this case,
    so we'll have to do it unconditionally when Vinstallation_directory
    is non-nil.  */
-#ifdef HAVE_NS
-  /* loadpath already includes the app-bundle's site-lisp.  */
-  if (!no_site_lisp && !egetenv ("EMACSLOADPATH") && !loadpath)
-#else
   if (!no_site_lisp && !egetenv ("EMACSLOADPATH"))
-#endif
     {
       Lisp_Object sitelisp;
       sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);
@@ -4270,12 +4265,7 @@ init_lread (void)
           load_path_check ();
 
           /* Add the site-lisp directories at the front.  */
-#ifdef HAVE_NS
-          /* loadpath already includes the app-bundle's site-lisp.  */
-          if (!no_site_lisp && !loadpath)
-#else
           if (!no_site_lisp)
-#endif
             {
               Lisp_Object sitelisp;
               sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index a2d1c36af64..10ab0619fb4 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,4 +1,4 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2000-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -406,6 +406,7 @@ CODING_H       = $(SRC)/coding.h \
 MS_W32_H       = $(SRC)/s/ms-w32.h \
                  $(NT_INC)/sys/stat.h
 CONFIG_H       = $(SRC)/config.h \
+                 $(SRC)/conf_post.h \
                  $(MS_W32_H)
 DIR_H          = $(NT_INC)/sys/dir.h \
                  $(SRC)/ndir.h
@@ -438,7 +439,8 @@ LANGINFO_H     = $(NT_INC)/langinfo.h \
 LISP_H         = $(SRC)/lisp.h \
                  $(SRC)/globals.h \
                  $(GNU_LIB)/intprops.h \
-                 $(INTTYPES_H)
+                 $(INTTYPES_H) \
+                 $(NT_INC)/stdalign.h
 MD5_H          = $(GNU_LIB)/md5.h \
                  $(NT_INC)/stdint.h
 MENU_H         = $(SRC)/menu.h \
@@ -783,7 +785,6 @@ $(BLD)/emacs.$(O) : \
         $(SRC)/w32heap.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/unistd.h \
-        $(GNU_LIB)/verify.h \
         $(BLOCKINPUT_H) \
         $(BUFFER_H) \
         $(CHARACTER_H) \
@@ -1164,6 +1165,7 @@ $(BLD)/w32inevt.$(O) : \
         $(SRC)/w32inevt.c \
         $(SRC)/termchar.h \
         $(SRC)/w32heap.h \
+        $(SRC)/w32inevt.h \
         $(BLOCKINPUT_H) \
         $(CONFIG_H) \
         $(DISPEXTERN_H) \
@@ -1195,6 +1197,7 @@ $(BLD)/w32console.$(O) : \
         $(SRC)/w32console.c \
         $(SRC)/disptab.h \
         $(SRC)/termchar.h \
+        $(SRC)/w32heap.h \
         $(SRC)/w32inevt.h \
         $(CHARACTER_H) \
         $(CODING_H) \
diff --git a/src/marker.c b/src/marker.c
index 0a93f4c180f..4ea06c7cd57 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -64,7 +64,7 @@ byte_char_debug_check (struct buffer *b, ptrdiff_t charpos, ptrdiff_t bytepos)
 
 #else /* not MARKER_DEBUG */
 
-#define byte_char_debug_check(b,charpos,bytepos) do { } while (0)
+#define byte_char_debug_check(b, charpos, bytepos) do { } while (0)
 
 #endif /* MARKER_DEBUG */
  
diff --git a/src/nsterm.m b/src/nsterm.m
index 1f06d49c5b9..4e181e9d1d2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -195,6 +195,7 @@ static int n_emacs_events_pending = 0;
 static NSMutableArray *ns_pending_files, *ns_pending_service_names,
   *ns_pending_service_args;
 static BOOL inNsSelect = 0;
+static BOOL ns_do_open_file = NO;
 
 /* Convert modifiers in a NeXTstep event to emacs style modifiers.  */
 #define NS_FUNCTION_KEY_MASK 0x800000
@@ -4025,7 +4026,7 @@ ns_term_init (Lisp_Object display_name)
   ns_pending_service_names = [[NSMutableArray alloc] init];
   ns_pending_service_args = [[NSMutableArray alloc] init];
 
-  /* Start app and create the main menu, window, view.
+/* Start app and create the main menu, window, view.
      Needs to be here because ns_initialize_display_info () uses AppKit classes.
      The view will then ask the NSApp to stop and return to Emacs. */
   [EmacsApp sharedApplication];
@@ -4205,7 +4206,7 @@ ns_term_init (Lisp_Object display_name)
 #endif /* MAC OS X menu setup */
 
   [NSApp run];
-
+  ns_do_open_file = YES;
   return dpyinfo;
 }
 
@@ -4446,7 +4447,8 @@ ns_term_shutdown (int sig)
 /*   Notification from the Workspace to open a file */
 - (BOOL)application: sender openFile: (NSString *)file
 {
-  [ns_pending_files addObject: file];
+  if (ns_do_open_file)
+    [ns_pending_files addObject: file];
   return YES;
 }
 
@@ -4454,7 +4456,8 @@ ns_term_shutdown (int sig)
 /*   Open a file as a temporary file */
 - (BOOL)application: sender openTempFile: (NSString *)file
 {
-  [ns_pending_files addObject: file];
+  if (ns_do_open_file)
+    [ns_pending_files addObject: file];
   return YES;
 }
 
@@ -4462,7 +4465,8 @@ ns_term_shutdown (int sig)
 /*   Notification from the Workspace to open a file noninteractively (?) */
 - (BOOL)application: sender openFileWithoutUI: (NSString *)file
 {
-  [ns_pending_files addObject: file];
+  if (ns_do_open_file)
+    [ns_pending_files addObject: file];
   return YES;
 }
 
@@ -4470,11 +4474,17 @@ ns_term_shutdown (int sig)
 /*   Notification from the Workspace to open multiple files */
 - (void)application: sender openFiles: (NSArray *)fileList
 {
-  NSEnumerator *files = [fileList objectEnumerator];
-  NSString *file;
-  while ((file = [files nextObject]) != nil)
-    [ns_pending_files addObject: file];
-
+  /* Don't open files from the command line, Cocoa parses the command line
+     wrong anyway, --option value tries to open value if --option is the last
+     option.  */
+  if (ns_ignore_open_file)
+    {
+      NSEnumerator *files = [fileList objectEnumerator];
+      NSString *file;
+      while ((file = [files nextObject]) != nil)
+        [ns_pending_files addObject: file];
+    }
+  
   [self replyToOpenOrPrint: NSApplicationDelegateReplySuccess];
 
 }
diff --git a/src/regex.c b/src/regex.c
index 4bf119402ac..afe3751ea5e 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -255,8 +255,6 @@ xrealloc (void *block, size_t size)
 /* Sword must be nonzero for the wordchar pattern commands in re_match_2.  */
 enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 };
 
-#  define SWITCH_ENUM_CAST(x) (x)
-
 /* Dummy macros for non-Emacs environments.  */
 # define CHAR_CHARSET(c) 0
 # define CHARSET_LEADING_CODE_BASE(c) 0
@@ -1739,20 +1737,6 @@ static int analyse_first (re_char *p, re_char *pend,
    be too small, many things would have to change.  */
 # define MAX_BUF_SIZE (1L << 15)
 
-#if 0  /* This is when we thought it could be 2^16 bytes.  */
-/* Any other compiler which, like MSC, has allocation limit below 2^16
-   bytes will have to use approach similar to what was done below for
-   MSC and drop MAX_BUF_SIZE a bit.  Otherwise you may end up
-   reallocating to 0 bytes.  Such thing is not going to work too well.
-   You have been warned!!  */
-#if defined _MSC_VER  && !defined WIN32
-/* Microsoft C 16-bit versions limit malloc to approx 65512 bytes.  */
-# define MAX_BUF_SIZE  65500L
-#else
-# define MAX_BUF_SIZE (1L << 16)
-#endif
-#endif /* 0 */
-
 /* Extend the buffer by twice its current size via realloc and
    reset the pointers that pointed into the old block to point to the
    correct places in the new one.  If extending the buffer results in it
@@ -3927,7 +3911,7 @@ analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int m
          as used for the *? operator.  */
       re_char *p1 = p;
 
-      switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+      switch (*p++)
         {
         case succeed:
           return 1;
@@ -4102,7 +4086,7 @@ analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int m
                visited.  `re_compile' should make sure this is true.  */
             break;
           p += j;
-          switch (SWITCH_ENUM_CAST ((re_opcode_t) *p))
+          switch (*p)
             {
             case on_failure_jump:
             case on_failure_keep_string_jump:
@@ -4635,7 +4619,7 @@ static int bcmp_translate (re_char *s1, re_char *s2,
 static re_char *
 skip_one_char (const re_char *p)
 {
-  switch (SWITCH_ENUM_CAST (*p++))
+  switch (*p++)
     {
     case anychar:
       break;
@@ -4680,7 +4664,7 @@ skip_noops (const re_char *p, const re_char *pend)
   int mcnt;
   while (p < pend)
     {
-      switch (SWITCH_ENUM_CAST ((re_opcode_t) *p))
+      switch (*p)
         {
         case start_memory:
         case stop_memory:
@@ -4725,7 +4709,7 @@ mutually_exclusive_p (struct re_pattern_buffer *bufp, const re_char *p1, const r
 
   op2 = p2 == pend ? succeed : *p2;
 
-  switch (SWITCH_ENUM_CAST (op2))
+  switch (op2)
     {
     case succeed:
     case endbuf:
@@ -4849,7 +4833,7 @@ mutually_exclusive_p (struct re_pattern_buffer *bufp, const re_char *p1, const r
       break;
 
     case charset_not:
-      switch (SWITCH_ENUM_CAST (*p1))
+      switch (*p1)
         {
         case exactn:
         case charset:
@@ -5327,7 +5311,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1,
         }
 
       /* Otherwise match next pattern command.  */
-      switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+      switch (*p++)
         {
         /* Ignore these.  Used to ignore the n of succeed_n's which
            currently have n == 0.  */
@@ -6249,7 +6233,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1,
           /* A restart point is known.  Restore to that state.  */
           DEBUG_PRINT1 ("\nFAIL:\n");
           POP_FAILURE_POINT (str, pat);
-          switch (SWITCH_ENUM_CAST ((re_opcode_t) *pat++))
+          switch (*pat++)
             {
             case on_failure_keep_string_jump:
               assert (str == NULL);
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
deleted file mode 100644
index 6c881a7fb8c..00000000000
--- a/src/s/aix4-2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
-#undef sigmask
-
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
deleted file mode 100644
index 9177403f426..00000000000
--- a/src/s/freebsd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* System description header for FreeBSD systems.
-
-Copyright (C) 1994-2012  Free Software Foundation, Inc.
-
-Author: Shawn M. Carey
-(according to authors.el)
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
deleted file mode 100644
index 2847fd6d19c..00000000000
--- a/src/s/gnu-linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This file is the configuration file for Linux-based GNU systems
-
-Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012
-  Free Software Foundation, Inc.
-
-This file was put together by Michael K. Johnson and Rik Faith.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 9b215845461..338c18cca52 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -19,14 +19,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "usg5-4-common.h"
 
-#undef _longjmp /* use system versions, not conservative aliases */
-#undef _setjmp
-
 #ifdef emacs
 char *_getpty();
 #endif
 
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
-
-#undef TIOCSIGSEND              /* defined in usg5-4-common.h */
-
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
deleted file mode 100644
index 7a571ee8116..00000000000
--- a/src/s/netbsd.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* s/ file for netbsd system.
-
-Copyright (C) 2001-2012  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* 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.  */
-#include <signal.h>
-
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
deleted file mode 100644
index 3bed55598b7..00000000000
--- a/src/s/sol2-6.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Definitions file for GNU Emacs running on Solaris 2.6.
-
-Copyright (C) 1999-2012  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "usg5-4-common.h"
-
diff --git a/src/s/unixware.h b/src/s/unixware.h
deleted file mode 100644
index 59c74a56f4e..00000000000
--- a/src/s/unixware.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* s/ file for Unixware.
-
-Copyright (C) 1999-2012  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "usg5-4-common.h"
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 6ead01d3712..05f22143460 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -20,11 +20,6 @@ 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/>.  */
 
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
-   but they will run slower.  */
-#define _setjmp setjmp
-#define _longjmp longjmp
-
 /* 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.  */
 #include <sys/wait.h>
@@ -47,8 +42,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   waitpid ((pid_t) -1, (status), (options))
 #define WRETCODE(w) (w >> 8)
 
-/* 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
-
diff --git a/src/search.c b/src/search.c
index 118cec4af48..480d0b75c70 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3054,12 +3054,12 @@ syms_of_search (void)
   DEFSYM (Qinvalid_regexp, "invalid-regexp");
 
   Fput (Qsearch_failed, Qerror_conditions,
-        pure_cons (Qsearch_failed, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qsearch_failed, Qerror));
   Fput (Qsearch_failed, Qerror_message,
         build_pure_c_string ("Search failed"));
 
   Fput (Qinvalid_regexp, Qerror_conditions,
-        pure_cons (Qinvalid_regexp, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qinvalid_regexp, Qerror));
   Fput (Qinvalid_regexp, Qerror_message,
         build_pure_c_string ("Invalid regexp"));
 
diff --git a/src/sound.c b/src/sound.c
index 151bc1a08c1..403f08240ce 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   cause an error to be generated.
 
   The Windows implementation of play-sound is implemented via the
-  Win32 API functions mciSendString, waveOutGetVolume, and
+  Windows API functions mciSendString, waveOutGetVolume, and
   waveOutSetVolume which are exported by Winmm.dll.
 */
 
diff --git a/src/syntax.c b/src/syntax.c
index 69c2789ed39..f0e30803dea 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1152,7 +1152,7 @@ DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
 
   insert_string ("\twhich means: ");
 
-  switch (SWITCH_ENUM_CAST (code))
+  switch (code)
     {
     case Swhitespace:
       insert_string ("whitespace"); break;
@@ -2525,7 +2525,7 @@ scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpf
           if (prefix)
             continue;
 
-          switch (SWITCH_ENUM_CAST (code))
+          switch (code)
             {
             case Sescape:
             case Scharquote:
@@ -2702,7 +2702,7 @@ scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpf
           else if (SYNTAX_FLAGS_PREFIX (syntax))
             continue;
 
-          switch (SWITCH_ENUM_CAST (code))
+          switch (code)
             {
             case Sword:
             case Ssymbol:
@@ -3123,7 +3123,7 @@ do { prev_from = from;				\
 
       if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
         continue;
-      switch (SWITCH_ENUM_CAST (code))
+      switch (code)
         {
         case Sescape:
         case Scharquote:
@@ -3473,7 +3473,7 @@ syms_of_syntax (void)
 
   DEFSYM (Qscan_error, "scan-error");
   Fput (Qscan_error, Qerror_conditions,
-        pure_cons (Qscan_error, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qscan_error, Qerror));
   Fput (Qscan_error, Qerror_message,
         build_pure_c_string ("Scan error"));
 
diff --git a/src/term.c b/src/term.c
index 4d73f896d21..f24caeffebb 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2209,11 +2209,10 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f)
 
   if (mode != tty->previous_color_mode)
     {
-      Lisp_Object funsym = intern ("tty-set-up-initial-frame-faces");
       tty->previous_color_mode = mode;
       tty_setup_colors (tty , mode);
       /*  This recomputes all the faces given the new color definitions.  */
-      safe_call (1, &funsym);
+      safe_call (1, intern ("tty-set-up-initial-frame-faces"));
     }
 }
 
diff --git a/src/w32.c b/src/w32.c
index e8c48a50a97..a9f4f6fb50e 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1,4 +1,4 @@
-/* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API.
+/* Utility and Unix shadow routines for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1994-1995, 2000-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1722,13 +1722,11 @@ init_environment (char ** argv)
                 dwType = REG_EXPAND_SZ;
                 dont_free = 1;
                 if (!strcmp (env_vars[i].name, "HOME") && !appdata)
-                  {
-                    Lisp_Object warning[2];
-                    warning[0] = intern ("initialization");
-                    warning[1] = build_string ("Setting HOME to C:\\ by default is deprecated");
-                    Vdelayed_warnings_list = Fcons (Flist (2, warning),
-                                                    Vdelayed_warnings_list);
-                  }
+                  Vdelayed_warnings_list
+                    = Fcons (listn (CONSTYPE_HEAP, 2,
+                                    intern ("initialization"),
+                                    build_string ("Setting HOME to C:\\ by default is deprecated")),
+                             Vdelayed_warnings_list);
               }
 
             if (lpval)
@@ -2013,7 +2011,7 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2])
 
 
 /* ------------------------------------------------------------------------- */
-/* IO support and wrapper functions for W32 API. */
+/* IO support and wrapper functions for the Windows API. */
 /* ------------------------------------------------------------------------- */
 
 /* Place a wrapper around the MSVC version of ctime.  It returns NULL
@@ -2931,7 +2929,7 @@ sys_rename (const char * oldname, const char * newname)
   /* volume_info is set indirectly by map_w32_filename.  */
   oldname_dev = volume_info.serialnum;
 
-  if (os_subtype == OS_WIN95)
+  if (os_subtype == OS_9X)
     {
       char * o;
       char * p;
diff --git a/src/w32console.c b/src/w32console.c
index 42d89cca6d7..76585851e7f 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,4 +1,4 @@
-/* Terminal hooks for GNU Emacs on the Microsoft W32 API.
+/* Terminal hooks for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1992, 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -37,6 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termhooks.h"
 #include "termchar.h"
 #include "dispextern.h"
+#include "w32heap.h"    /* for os_subtype */
 #include "w32inevt.h"
 
 /* from window.c */
@@ -67,6 +68,7 @@ static CONSOLE_CURSOR_INFO prev_console_cursor;
 #endif
 
 HANDLE  keyboard_handle;
+int w32_console_unicode_input;
 
 
 /* Setting this as the ctrl handler prevents emacs from being killed when
@@ -513,7 +515,7 @@ w32con_set_terminal_modes (struct terminal *t)
 {
   CONSOLE_CURSOR_INFO cci;
 
-  /* make cursor big and visible (100 on Win95 makes it disappear)  */
+  /* make cursor big and visible (100 on Windows 95 makes it disappear)  */
   cci.dwSize = 99;
   cci.bVisible = TRUE;
   (void) SetConsoleCursorInfo (cur_screen, &cci);
@@ -786,6 +788,11 @@ initialize_w32_display (struct terminal *term)
                        info.srWindow.Left);
     }
 
+  if (os_subtype == OS_NT)
+    w32_console_unicode_input = 1;
+  else
+    w32_console_unicode_input = 0;
+
   /* Setup w32_display_info structure for this frame. */
 
   w32_initialize_display_info (build_string ("Console"));
diff --git a/src/w32fns.c b/src/w32fns.c
index 06938e3124b..91744e2691f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,4 +1,4 @@
-/* Graphical user interface functions for the Microsoft W32 API.
+/* Graphical user interface functions for the Microsoft Windows API.
 
 Copyright (C) 1989, 1992-2012  Free Software Foundation, Inc.
 
@@ -2882,7 +2882,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                       key.uChar.AsciiChar = 0;
                       key.dwControlKeyState = modifiers;
 
-                      add = w32_kbd_patch_key (&key);
+                      add = w32_kbd_patch_key (&key, w32_keyboard_codepage);
                       /* 0 means an unrecognized keycode, negative means
                          dead key.  Ignore both.  */
                       while (--add >= 0)
@@ -2892,7 +2892,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                             (hwnd, WM_CHAR,
                              (unsigned char) key.uChar.AsciiChar, lParam,
                              w32_get_key_modifiers (wParam, lParam));
-                          w32_kbd_patch_key (&key);
+                          w32_kbd_patch_key (&key, w32_keyboard_codepage);
                         }
                       return 0;
                     }
@@ -6470,7 +6470,6 @@ The following %-sequences are provided:
     {
       Lisp_Object line_status, battery_status, battery_status_symbol;
       Lisp_Object load_percentage, seconds, minutes, hours, remain;
-      Lisp_Object sequences[8];
 
       long seconds_left = (long) system_status.BatteryLifeTime;
 
@@ -6544,16 +6543,16 @@ The following %-sequences are provided:
           _snprintf (buffer, 16, "%ld:%02ld", m / 60, m % 60);
           remain = build_string (buffer);
         }
-      sequences[0] = Fcons (make_number ('L'), line_status);
-      sequences[1] = Fcons (make_number ('B'), battery_status);
-      sequences[2] = Fcons (make_number ('b'), battery_status_symbol);
-      sequences[3] = Fcons (make_number ('p'), load_percentage);
-      sequences[4] = Fcons (make_number ('s'), seconds);
-      sequences[5] = Fcons (make_number ('m'), minutes);
-      sequences[6] = Fcons (make_number ('h'), hours);
-      sequences[7] = Fcons (make_number ('t'), remain);
-
-      status = Flist (8, sequences);
+
+      status = listn (CONSTYPE_HEAP, 8,
+                      Fcons (make_number ('L'), line_status),
+                      Fcons (make_number ('B'), battery_status),
+                      Fcons (make_number ('b'), battery_status_symbol),
+                      Fcons (make_number ('p'), load_percentage),
+                      Fcons (make_number ('s'), seconds),
+                      Fcons (make_number ('m'), minutes),
+                      Fcons (make_number ('h'), hours),
+                      Fcons (make_number ('t'), remain));
     }
   return status;
 }
@@ -6576,7 +6575,7 @@ If the underlying system call fails, value is nil.  */)
   value = Qnil;
 
   /* Determining the required information on Windows turns out, sadly,
-     to be more involved than one would hope.  The original Win32 api
+     to be more involved than one would hope.  The original Windows API
      call for this will return bogus information on some systems, but we
      must dynamically probe for the replacement api, since that was
      added rather late on.  */
@@ -6795,7 +6794,7 @@ syms_of_w32fns (void)
 
 
   Fput (Qundefined_color, Qerror_conditions,
-        pure_cons (Qundefined_color, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
   Fput (Qundefined_color, Qerror_message,
         build_pure_c_string ("Undefined color"));
 
diff --git a/src/w32font.c b/src/w32font.c
index 81378825412..fd24a90d60b 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1,4 +1,4 @@
-/* Font backend for the Microsoft W32 API.
+/* Font backend for the Microsoft Windows API.
    Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -292,7 +292,7 @@ intern_font_name (char * string)
   Lisp_Object str = DECODE_SYSTEM (build_string (string));
   int len = SCHARS (str);
   Lisp_Object obarray = check_obarray (Vobarray);
-  Lisp_Object tem = oblookup (obarray, SDATA (str), len, len);  
+  Lisp_Object tem = oblookup (obarray, SDATA (str), len, len);
   /* This code is similar to intern function from lread.c.  */
   return SYMBOLP (tem) ? tem : Fintern (str, obarray);
 }
@@ -1394,7 +1394,7 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font,
                    currently appear in fontset.el, so it isn't worth
                    creating a mapping table of codepages/scripts to languages
                    or opening the font to see if there are any language tags
-                   in it that the W32 API does not expose. Fontset
+                   in it that the Windows API does not expose. Fontset
                    spec should have a fallback, as some backends do
                    not recognize language at all.  */
                 return 0;
diff --git a/src/w32font.h b/src/w32font.h
index 40edafa146d..b08d48a3d36 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -1,4 +1,4 @@
-/* Shared GDI and Uniscribe Font backend declarations for the W32 API.
+/* Shared GDI and Uniscribe Font backend declarations for the Windows API.
    Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/w32gui.h b/src/w32gui.h
index 1e800e3cf3a..1ea185bfaa1 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,4 +1,4 @@
-/* Definitions and headers for communication on the Microsoft W32 API.
+/* Definitions and headers for communication on the Microsoft Windows API.
    Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/w32heap.c b/src/w32heap.c
index cc5e5cd2bf5..26cc9aa0a0f 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,4 +1,4 @@
-/* Heap management routines for GNU Emacs on the Microsoft W32 API.
+/* Heap management routines for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -66,7 +66,7 @@ cache_system_info (void)
   w32_minor_version = version.info.minor;
 
   if (version.info.platform & 0x8000)
-    os_subtype = OS_WIN95;
+    os_subtype = OS_9X;
   else
     os_subtype = OS_NT;
 
@@ -79,7 +79,7 @@ cache_system_info (void)
   GetVersionEx (&osinfo_cache);
 
   w32_build_number = osinfo_cache.dwBuildNumber;
-  if (os_subtype == OS_WIN95)
+  if (os_subtype == OS_9X)
     w32_build_number &= 0xffff;
 }
 
diff --git a/src/w32heap.h b/src/w32heap.h
index b2d51655098..fda3c58bf01 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -51,7 +51,7 @@ extern int    	      w32_minor_version;
 extern int            w32_build_number;
 
 enum {
-  OS_WIN95 = 1,
+  OS_9X = 1,
   OS_NT
 };
 
@@ -92,4 +92,3 @@ IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
 IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
 
 #endif /* NTHEAP_H_ */
-
diff --git a/src/w32inevt.c b/src/w32inevt.c
index a85fdbbe435..731dd6715dc 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -1,4 +1,4 @@
-/* Input event support for Emacs on the Microsoft W32 API.
+/* Input event support for Emacs on the Microsoft Windows API.
    Copyright (C) 1992-1993, 1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -41,6 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termchar.h"
 #include "w32heap.h"
 #include "w32term.h"
+#include "w32inevt.h"
 
 /* stdin, from w32console.c */
 extern HANDLE keyboard_handle;
@@ -61,6 +62,15 @@ static INPUT_RECORD *queue_ptr = event_queue, *queue_end = event_queue;
 /* Temporarily store lead byte of DBCS input sequences.  */
 static char dbcs_lead = 0;
 
+static inline BOOL
+w32_read_console_input (HANDLE h, INPUT_RECORD *rec, DWORD recsize,
+                        DWORD *waiting)
+{
+  return (w32_console_unicode_input
+          ? ReadConsoleInputW (h, rec, recsize, waiting)
+          : ReadConsoleInputA (h, rec, recsize, waiting));
+}
+
 static int
 fill_queue (BOOL block)
 {
@@ -80,8 +90,8 @@ fill_queue (BOOL block)
         return 0;
     }
 
-  rc = ReadConsoleInput (keyboard_handle, event_queue, EVENT_QUEUE_SIZE,
-                         &events_waiting);
+  rc = w32_read_console_input (keyboard_handle, event_queue, EVENT_QUEUE_SIZE,
+                               &events_waiting);
   if (!rc)
     return -1;
   queue_ptr = event_queue;
@@ -175,9 +185,11 @@ is_dead_key (int wparam)
 }
 #endif
 
-/* The return code indicates key code size. */
+/* The return code indicates key code size.  cpID is the codepage to
+   use for translation to Unicode; -1 means use the current console
+   input codepage.  */
 int
-w32_kbd_patch_key (KEY_EVENT_RECORD *event)
+w32_kbd_patch_key (KEY_EVENT_RECORD *event, int cpId)
 {
   unsigned int key_code = event->wVirtualKeyCode;
   unsigned int mods = event->dwControlKeyState;
@@ -224,7 +236,7 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event)
 #endif
 
   /* On NT, call ToUnicode instead and then convert to the current
-     locale's default codepage.  */
+     console input codepage.  */
   if (os_subtype == OS_NT)
     {
       WCHAR buf[128];
@@ -233,14 +245,13 @@ w32_kbd_patch_key (KEY_EVENT_RECORD *event)
                           keystate, buf, 128, 0);
       if (isdead > 0)
         {
-          char cp[20];
-          int cpId;
+          /* When we are called from the GUI message processing code,
+             we are passed the current keyboard codepage, a positive
+             number, to use below.  */
+          if (cpId == -1)
+            cpId = GetConsoleCP ();
 
           event->uChar.UnicodeChar = buf[isdead - 1];
-
-          GetLocaleInfo (GetThreadLocale (),
-                         LOCALE_IDEFAULTANSICODEPAGE, cp, 20);
-          cpId = atoi (cp);
           isdead = WideCharToMultiByte (cpId, 0, buf, isdead,
                                         ansi_code, 4, NULL, NULL);
         }
@@ -437,7 +448,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
              base character (ie. translating the base key plus shift
              modifier).  */
           else if (event->uChar.AsciiChar == 0)
-            w32_kbd_patch_key (event);
+            w32_kbd_patch_key (event, -1);
         }
 
       if (event->uChar.AsciiChar == 0)
@@ -447,26 +458,34 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
         }
       else if (event->uChar.AsciiChar > 0)
         {
+          /* Pure ASCII characters < 128.  */
           emacs_ev->kind = ASCII_KEYSTROKE_EVENT;
           emacs_ev->code = event->uChar.AsciiChar;
         }
-      else if (event->uChar.UnicodeChar > 0)
+      else if (event->uChar.UnicodeChar > 0
+               && w32_console_unicode_input)
         {
+          /* Unicode codepoint; only valid if we are using Unicode
+             console input mode.  */
           emacs_ev->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
           emacs_ev->code = event->uChar.UnicodeChar;
         }
       else
         {
-          /* Fallback for non-Unicode versions of Windows.  */
+          /* Fallback handling of non-ASCII characters for non-Unicode
+             versions of Windows, and for non-Unicode input on NT
+             family of Windows.  Only characters in the current
+             console codepage are supported by this fallback.  */
           wchar_t code;
           char dbcs[2];
-          char cp[20];
           int cpId;
 
-          /* Get the codepage to interpret this key with.  */
-          GetLocaleInfo (GetThreadLocale (),
-                         LOCALE_IDEFAULTANSICODEPAGE, cp, 20);
-          cpId = atoi (cp);
+          /* Get the current console input codepage to interpret this
+             key with.  Note that the system defaults for the OEM
+             codepage could have been changed by calling SetConsoleCP
+             or w32-set-console-codepage, so using GetLocaleInfo to
+             get LOCALE_IDEFAULTCODEPAGE is not TRT here.  */
+          cpId = GetConsoleCP ();
 
           dbcs[0] = dbcs_lead;
           dbcs[1] = event->uChar.AsciiChar;
@@ -501,6 +520,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
     }
   else
     {
+      /* Function keys and other non-character keys.  */
       emacs_ev->kind = NON_ASCII_KEYSTROKE_EVENT;
       emacs_ev->code = event->wVirtualKeyCode;
     }
diff --git a/src/w32inevt.h b/src/w32inevt.h
index d228637abfb..c874e58ef39 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,4 +1,4 @@
-/* Input routines for GNU Emacs on the Microsoft W32 API.
+/* Input routines for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -19,6 +19,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_W32INEVT_H
 #define EMACS_W32INEVT_H
 
+extern int w32_console_unicode_input;
+
 extern int w32_console_read_socket (struct terminal *term, int numchars,
                                     struct input_event *hold_quit);
 extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
@@ -28,4 +30,3 @@ extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
                                         unsigned long *time);
 
 #endif /* EMACS_W32INEVT_H */
-
diff --git a/src/w32menu.c b/src/w32menu.c
index 871baedd0d3..09484d74b79 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1,4 +1,4 @@
-/* Menu support for GNU Emacs on the Microsoft W32 API.
+/* Menu support for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2012
                  Free Software Foundation, Inc.
 
diff --git a/src/w32proc.c b/src/w32proc.c
index afc1b21fdde..cfc82fa2c47 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1,4 +1,4 @@
-/* Process support for GNU Emacs on the Microsoft W32 API.
+/* Process support for GNU Emacs on the Microsoft Windows API.
    Copyright (C) 1992, 1995, 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -799,7 +799,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
   unixtodos_filename (cmdname);
   argv[0] = cmdname;
 
-  /* Determine whether program is a 16-bit DOS executable, or a w32
+  /* Determine whether program is a 16-bit DOS executable, or a 32-bit Windows
      executable that is implicitly linked to the Cygnus dll (implying it
      was compiled with the Cygnus GNU toolchain and hence relies on
      cygwin.dll to parse the command line - we use this to decide how to
@@ -1386,7 +1386,7 @@ find_child_console (HWND hwnd, LPARAM arg)
 
       GetClassName (hwnd, window_class, sizeof (window_class));
       if (strcmp (window_class,
-                  (os_subtype == OS_WIN95)
+                  (os_subtype == OS_9X)
                   ? "tty"
                   : "ConsoleWindowClass") == 0)
         {
@@ -1517,7 +1517,7 @@ sys_kill (int pid, int sig)
       if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd)
         {
 #if 1
-          if (os_subtype == OS_WIN95)
+          if (os_subtype == OS_9X)
             {
 /*
    Another possibility is to try terminating the VDM out-right by
@@ -1536,7 +1536,7 @@ sys_kill (int pid, int sig)
 
 */
 #if 0
-              /* On Win95, posting WM_QUIT causes the 16-bit subsystem
+              /* On Windows 95, posting WM_QUIT causes the 16-bit subsystem
                  to hang when cmdproxy is used in conjunction with
                  command.com for an interactive shell.  Posting
                  WM_CLOSE pops up a dialog that, when Yes is selected,
@@ -1810,7 +1810,7 @@ If successful, the return value is t, otherwise nil.  */)
       CHECK_NUMBER (process);
 
       /* Allow pid to be an internally generated one, or one obtained
-         externally.  This is necessary because real pids on Win95 are
+         externally.  This is necessary because real pids on Windows 95 are
          negative.  */
 
       pid = XINT (process);
diff --git a/src/w32select.c b/src/w32select.c
index 1d4a6f41bdd..59ff4405368 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,4 +1,4 @@
-/* Selection processing for Emacs on the Microsoft W32 API.
+/* Selection processing for Emacs on the Microsoft Windows API.
 
 Copyright (C) 1993-1994, 2001-2012  Free Software Foundation, Inc.
 
diff --git a/src/w32term.c b/src/w32term.c
index 6f0065de9eb..7c4860d5139 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,4 +1,4 @@
-/* Implementation of GUI terminal on the Microsoft W32 API.
+/* Implementation of GUI terminal on the Microsoft Windows API.
 
 Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
 
@@ -155,6 +155,9 @@ int vertical_scroll_bar_bottom_border;
 
 int last_scroll_bar_drag_pos;
 
+/* Keyboard code page - may be changed by language-change events.  */
+int w32_keyboard_codepage;
+
 /* Mouse movement. */
 
 /* Where the mouse was last time we reported a mouse event.  */
@@ -188,9 +191,6 @@ static int volatile input_signal_count;
 static int input_signal_count;
 #endif
 
-/* Keyboard code page - may be changed by language-change events.  */
-static int keyboard_codepage;
-
 static void x_update_window_end (struct window *, int, int);
 static void w32_handle_tool_bar_click (struct frame *,
                                        struct input_event *);
@@ -4235,14 +4235,14 @@ w32_read_socket (struct terminal *terminal, int expected,
 
           /* lParam contains the input language ID in its low 16 bits.
              Use it to update our record of the keyboard codepage.  */
-          keyboard_codepage = codepage_for_locale ((LCID)(msg.msg.lParam
-                                                          & 0xffff));
+          w32_keyboard_codepage = codepage_for_locale ((LCID)(msg.msg.lParam
+                                                              & 0xffff));
 
           if (f)
             {
               inev.kind = LANGUAGE_CHANGE_EVENT;
               XSETFRAME (inev.frame_or_window, f);
-              inev.code = keyboard_codepage;
+              inev.code = w32_keyboard_codepage;
               inev.modifiers = msg.msg.lParam & 0xffff;
             }
           break;
@@ -4308,7 +4308,7 @@ w32_read_socket (struct terminal *terminal, int expected,
                     {
                       dbcs[0] = dbcs_lead;
                       dbcs_lead = 0;
-                      if (!MultiByteToWideChar (keyboard_codepage, 0,
+                      if (!MultiByteToWideChar (w32_keyboard_codepage, 0,
                                                 dbcs, 2, &code, 1))
                         {
                           /* Garbage */
@@ -4318,7 +4318,7 @@ w32_read_socket (struct terminal *terminal, int expected,
                           break;
                         }
                     }
-                  else if (IsDBCSLeadByteEx (keyboard_codepage,
+                  else if (IsDBCSLeadByteEx (w32_keyboard_codepage,
                                              (BYTE) msg.msg.wParam))
                     {
                       dbcs_lead = (char) msg.msg.wParam;
@@ -4327,7 +4327,7 @@ w32_read_socket (struct terminal *terminal, int expected,
                     }
                   else
                     {
-                      if (!MultiByteToWideChar (keyboard_codepage, 0,
+                      if (!MultiByteToWideChar (w32_keyboard_codepage, 0,
                                                 &dbcs[1], 1, &code, 1))
                         {
                           /* What to do with garbage? */
@@ -6426,7 +6426,8 @@ w32_initialize (void)
 
   {
     DWORD input_locale_id = (DWORD) GetKeyboardLayout (0);
-    keyboard_codepage = codepage_for_locale ((LCID) (input_locale_id & 0xffff));
+    w32_keyboard_codepage =
+      codepage_for_locale ((LCID) (input_locale_id & 0xffff));
   }
 
   /* Create the window thread - it will terminate itself when the app
diff --git a/src/w32term.h b/src/w32term.h
index 4fdf560dabc..c0a958ba5e5 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,4 +1,4 @@
-/* Definitions and headers for communication on the Microsoft W32 API.
+/* Definitions and headers for communication on the Microsoft Windows API.
    Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -667,6 +667,9 @@ extern void x_delete_display (struct w32_display_info *dpyinfo);
 #define RIGHT_WIN_PRESSED      0x4000
 #define APPS_PRESSED           0x2000
 
+/* The current ANSI input codepage for GUI sessions.  */
+extern int w32_keyboard_codepage;
+
 /* When compiling on Windows 9x/ME and NT 3.x, the following are not defined
    (even though they are supported on 98 and ME.  */
 #ifndef WM_MOUSELEAVE
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 0b0fc26fb6a..745a5cfe3e7 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -1,4 +1,4 @@
-/* Functions taken directly from X sources for use with the Microsoft W32 API.
+/* Functions taken directly from X sources for use with the Microsoft Windows API.
    Copyright (C) 1989, 1992-1995, 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/xdisp.c b/src/xdisp.c
index 6a9d2d3ac4c..57a8c9d21a3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2408,16 +2408,12 @@ safe_eval_handler (Lisp_Object arg)
   return Qnil;
 }
 
-
-/* Evaluate SEXPR and return the result, or nil if something went
+/* Call function FUNC with the rest of NARGS - 1 arguments
+   following.  Return the result, or nil if something went
    wrong.  Prevent redisplay during the evaluation.  */
 
-/* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1].
-   Return the result, or nil if something went wrong.  Prevent
-   redisplay during the evaluation.  */
-
 Lisp_Object
-safe_call (ptrdiff_t nargs, Lisp_Object *args)
+safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
 {
   Lisp_Object val;
 
@@ -2425,8 +2421,17 @@ safe_call (ptrdiff_t nargs, Lisp_Object *args)
     val = Qnil;
   else
     {
+      va_list ap;
+      ptrdiff_t i;
       ptrdiff_t count = SPECPDL_INDEX ();
       struct gcpro gcpro1;
+      Lisp_Object *args = alloca (nargs * sizeof (Lisp_Object));
+
+      args[0] = func;
+      va_start (ap, func);
+      for (i = 1; i < nargs; i++)
+        args[i] = va_arg (ap, Lisp_Object);
+      va_end (ap);
 
       GCPRO1 (args[0]);
       gcpro1.nvars = nargs;
@@ -2449,10 +2454,7 @@ safe_call (ptrdiff_t nargs, Lisp_Object *args)
 Lisp_Object
 safe_call1 (Lisp_Object fn, Lisp_Object arg)
 {
-  Lisp_Object args[2];
-  args[0] = fn;
-  args[1] = arg;
-  return safe_call (2, args);
+  return safe_call (2, fn, arg);
 }
 
 static Lisp_Object Qeval;
@@ -2463,17 +2465,13 @@ safe_eval (Lisp_Object sexpr)
   return safe_call1 (Qeval, sexpr);
 }
 
-/* Call function FN with one argument ARG.
+/* Call function FN with two arguments ARG1 and ARG2.
    Return the result, or nil if something went wrong.  */
 
 Lisp_Object
 safe_call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2)
 {
-  Lisp_Object args[3];
-  args[0] = fn;
-  args[1] = arg1;
-  args[2] = arg2;
-  return safe_call (3, args);
+  return safe_call (3, fn, arg1, arg2);
 }
 
 
@@ -2741,7 +2739,11 @@ init_iterator (struct it *it, struct window *w,
      frames when the fringes are turned off.  But leave the dimensions
      zero for tooltip frames, as these glyphs look ugly there and also
      sabotage calculations of tooltip dimensions in x-show-tip.  */
-  if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame)))
+#ifdef HAVE_WINDOW_SYSTEM
+  if (!(FRAME_WINDOW_P (it->f)
+        && FRAMEP (tip_frame)
+        && it->f == XFRAME (tip_frame)))
+#endif
     {
       if (it->line_wrap == TRUNCATE)
         {
@@ -20517,7 +20519,7 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
 
   depth++;
 
-  switch (SWITCH_ENUM_CAST (XTYPE (elt)))
+  switch (XTYPE (elt))
     {
     case Lisp_String:
       {
@@ -29184,14 +29186,14 @@ and is used only on frames for which no explicit name has been set
 \(see `modify-frame-parameters').  */);
   Vicon_title_format
     = Vframe_title_format
-    = pure_cons (intern_c_string ("multiple-frames"),
-                 pure_cons (build_pure_c_string ("%b"),
-                            pure_cons (pure_cons (empty_unibyte_string,
-                                                  pure_cons (intern_c_string ("invocation-name"),
-                                                             pure_cons (build_pure_c_string ("@"),
-                                                                        pure_cons (intern_c_string ("system-name"),
-                                                                                   Qnil)))),
-                                       Qnil)));
+    = listn (CONSTYPE_PURE, 3,
+             intern_c_string ("multiple-frames"),
+             build_pure_c_string ("%b"),
+             listn (CONSTYPE_PURE, 4,
+                    empty_unibyte_string,
+                    intern_c_string ("invocation-name"),
+                    build_pure_c_string ("@"),
+                    intern_c_string ("system-name")));
 
   DEFVAR_LISP ("message-log-max", Vmessage_log_max,
     doc: /* Maximum number of lines to keep in the message log buffer.
diff --git a/src/xfaces.c b/src/xfaces.c
index e9089017c4e..6a34c3c8893 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2254,11 +2254,7 @@ merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid)
     {
       /* Call function with current height as argument.
          From is the new height.  */
-      Lisp_Object args[2];
-
-      args[0] = from;
-      args[1] = to;
-      result = safe_call (2, args);
+      result = safe_call1 (from, to);
 
       /* Ensure that if TO was absolute, so is the result.  */
       if (INTEGERP (to) && !INTEGERP (result))
diff --git a/src/xfns.c b/src/xfns.c
index e431651d93a..c8c96b642f0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5822,7 +5822,7 @@ syms_of_xfns (void)
   /* This is the end of symbol initialization.  */
 
   Fput (Qundefined_color, Qerror_conditions,
-        pure_cons (Qundefined_color, pure_cons (Qerror, Qnil)));
+        listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
   Fput (Qundefined_color, Qerror_message,
         build_pure_c_string ("Undefined color"));