398 files changed, 160 insertions, 2121 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index ccc36694da8..ca6f5f255a2 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -393,5 +393,3 @@ break abort
 # before Emacs exits.  Perhaps we should put the break somewhere else
 # instead...
 break x_error_quitter
-
-# arch-tag: 12f34321-7bfa-4240-b77a-3cd3a1696dfe
diff --git a/src/.gdbinit-union b/src/.gdbinit-union
deleted file mode 100644
index 1af2c0976c4..00000000000
--- a/src/.gdbinit-union
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001
-#   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 2, 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; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Force loading of symbols, enough to give us gdb_valbits etc.
-set main
-
-# Find lwlib source files too.
-dir ../lwlib
-#dir /gd/gnu/lesstif-0.89.9/lib/Xm
-
-# Don't enter GDB when user types C-g to quit.
-# This has one unfortunate effect: you can't type C-c
-# at the GDB to stop Emacs, when using X.
-# However, C-z works just as well in that case.
-handle 2 noprint pass
-
-# Don't pass SIGALRM to Emacs.  This makes problems when
-# debugging.
-handle SIGALRM ignore
-
-# Set up a mask to use.
-# This should be EMACS_INT, but in some cases that is a macro.
-# long ought to work in all cases right now.
-set $valmask = ((long)1 << gdb_valbits) - 1
-set $nonvalbits = gdb_emacs_intbits - gdb_valbits
-
-# Set up something to print out s-expressions.
-define pr
-set debug_print ($)
-end
-document pr
-Print the emacs s-expression which is $.
-Works only when an inferior emacs is executing.
-end
-
-define xtype
-output (enum Lisp_Type) (($.i >> gdb_valbits) & 0x7)
-echo \n
-output ((($.i >> gdb_valbits) & 0x7) == Lisp_Misc ? (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits))->type) : (($.i >> gdb_valbits) & 0x7) == Lisp_Vectorlike ? ($size = ((struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits))->size, (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)) : 0)
-echo \n
-end
-document xtype
-Print the type of $, assuming it is an Emacs Lisp value.
-If the first type printed is Lisp_Vector or Lisp_Misc,
-the second line gives the more precise type.
-Otherwise the second line doesn't mean anything.
-end
-
-define xvectype
-  set $size = ((struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits))->size
-  output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
-  echo \n
-end
-document xvectype
-  Print the vector subtype of $, assuming it is a vector or pseudovector.
-end
-
-define xmisctype
-  output (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits))->type)
-  echo \n
-end
-document xmisctype
-  Print the specific type of $, assuming it is some misc type.
-end
-
-define xint
-  print (($.i & $valmask) << $nonvalbits) >> $nonvalbits
-end
-document xint
-  Print $, assuming it is an Emacs Lisp integer.  This gets the sign right.
-end
-
-define xptr
-  print (void *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xptr
-  Print the pointer portion of $, assuming it is an Emacs Lisp value.
-end
-
-define xmarker
-  print (struct Lisp_Marker *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xmarker
-  Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
-end
-
-define xoverlay
-  print (struct Lisp_Overlay *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xoverlay
-  Print $ as a overlay pointer, assuming it is an Emacs Lisp overlay value.
-end
-
-define xmiscfree
-  print (struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xmiscfree
-  Print $ as a misc free-cell pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xintfwd
-  print (struct Lisp_Intfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xintfwd
-  Print $ as an integer forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xboolfwd
-  print (struct Lisp_Boolfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xboolfwd
-  Print $ as a boolean forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xobjfwd
-  print (struct Lisp_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xobjfwd
-  Print $ as an object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xbufobjfwd
-  print (struct Lisp_Buffer_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xbufobjfwd
-  Print $ as a buffer-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xkbobjfwd
-  print (struct Lisp_Kboard_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xkbobjfwd
-  Print $ as a kboard-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xbuflocal
-  print (struct Lisp_Buffer_Local_Value *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xbuflocal
-  Print $ as a buffer-local-value pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xsymbol
-  print (struct Lisp_Symbol *) (($.i & $valmask) | gdb_data_seg_bits)
-  xprintsymptr $
-end
-document xsymbol
-  Print the name and address of the symbol $.
-  This command assumes that $ is an Emacs Lisp symbol value.
-end
-
-define xstring
-  print (struct Lisp_String *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : $->size_byte)
-  echo \n
-end
-document xstring
-  Print the contents and address of the string $.
-  This command assumes that $ is an Emacs Lisp string value.
-end
-
-define xvector
-  print (struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 50) ? 0 : ($->contents[0])@($->size)
-  echo \n
-end
-document xvector
-  Print the contents and address of the vector $.
-  This command assumes that $ is an Emacs Lisp vector value.
-end
-
-define xprocess
-  print (struct Lisp_Process *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xprocess
-  Print the address of the struct Lisp_process which the Lisp_Object $ points to.
-end
-
-define xframe
-  print (struct frame *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xframe
-  Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
-end
-
-define xcompiled
-  print (struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->contents[0])@($->size & 0xff)
-end
-document xcompiled
-  Print $ as a compiled function pointer, assuming it is an Emacs Lisp compiled value.
-end
-
-define xwindow
-  print (struct window *) (($.i & $valmask) | gdb_data_seg_bits)
-  printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
-end
-document xwindow
-  Print $ as a window pointer, assuming it is an Emacs Lisp window value.
-  Print the window's position as "WIDTHxHEIGHT+LEFT+TOP".
-end
-
-define xwinconfig
-  print (struct save_window_data *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xwinconfig
-  Print $ as a window configuration pointer, assuming it is an Emacs Lisp window configuration value.
-end
-
-define xsubr
-  print (struct Lisp_Subr *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xsubr
-  Print the address of the subr which the Lisp_Object $ points to.
-end
-
-define xchartable
-  print (struct Lisp_Char_Table *) (($.i & $valmask) | gdb_data_seg_bits)
-  printf "Purpose: "
-  output (char*)&((struct Lisp_Symbol *) (($->purpose.i & $valmask) | gdb_data_seg_bits))->name->data
-  printf "  %d extra slots", ($->size & 0x1ff) - 388
-  echo \n
-end
-document xchartable
-  Print the address of the char-table $, and its purpose.
-  This command assumes that $ is an Emacs Lisp char-table value.
-end
-
-define xboolvector
-  print (struct Lisp_Bool_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
-  echo \n
-end
-document xboolvector
-  Print the contents and address of the bool-vector $.
-  This command assumes that $ is an Emacs Lisp bool-vector value.
-end
-
-define xbuffer
-  print (struct buffer *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ((struct Lisp_String *) (($->name.i & $valmask) | gdb_data_seg_bits))->data
-  echo \n
-end
-document xbuffer
-  Set $ as a buffer pointer, assuming it is an Emacs Lisp buffer value.
-  Print the name of the buffer.
-end
-
-define xhashtable
-  print (struct Lisp_Hash_Table *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xhashtable
-  Set $ as a hash table pointer, assuming it is an Emacs Lisp hash table value.
-end
-
-define xcons
-  print (struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits)
-  output/x *$
-  echo \n
-end
-document xcons
-  Print the contents of $, assuming it is an Emacs Lisp cons.
-end
-
-define nextcons
-  p $.cdr
-  xcons
-end
-document nextcons
-  Print the contents of the next cell in a list.
-  This assumes that the last thing you printed was a cons cell contents
-  (type struct Lisp_Cons) or a pointer to one.
-end
-
-define xcar
-  print/x ((($.i >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits))->car : 0)
-end
-document xcar
-  Print the car of $, assuming it is an Emacs Lisp pair.
-end
-
-define xcdr
-  print/x ((($.i >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits))->cdr : 0)
-end
-document xcdr
-  Print the cdr of $, assuming it is an Emacs Lisp pair.
-end
-
-define xfloat
-  print ((struct Lisp_Float *) (($.i & $valmask) | gdb_data_seg_bits))->data
-end
-document xfloat
-  Print $ assuming it is a lisp floating-point number.
-end
-
-define xscrollbar
-  print (struct scrollbar *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xscrollbar
-  Print $ as a scrollbar pointer.
-end
-
-define xprintsym
-  set $sym = ((struct Lisp_Symbol *) (($arg0.i & $valmask) | gdb_data_seg_bits))
-  xprintsymptr $sym
-end
-document xprintsym
-  Print argument as a symbol.
-end
-define xprintsymptr
-  set $sym = $arg0
-  set $sym_name = ((struct Lisp_String *)(($sym->xname.i & $valmask) | gdb_data_seg_bits))
-  output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size : $sym_name->size_byte)
-  echo \n
-end
-
-define xbacktrace
-  set $bt = backtrace_list
-  while $bt
-    set $type = (enum Lisp_Type) (((*$bt->function).i >> gdb_valbits) & 0x7)
-    if $type == Lisp_Symbol
-      xprintsym (*$bt->function)
-    else
-      printf "0x%x ", (*$bt->function).i
-      if $type == Lisp_Vectorlike
-        set $size = ((struct Lisp_Vector *) (((*$bt->function).i & $valmask) | gdb_data_seg_bits))->size
-        output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
-      else
-        printf "Lisp type %d", $type
-      end
-      echo \n
-    end
-    set $bt = $bt->next
-  end
-end
-document xbacktrace
-  Print a backtrace of Lisp function calls from backtrace_list.
-  Set a breakpoint at Fsignal and call this to see from where
-  an error was signaled.
-end
-
-define xreload
-  set $valmask = ((long)1 << gdb_valbits) - 1
-  set $nonvalbits = gdb_emacs_intbits - gdb_valbits
-end
-document xreload
-  When starting Emacs a second time in the same gdb session under
-  FreeBSD 2.2.5, gdb 4.13, $valmask and $nonvalbits have lost
-  their values.  (The same happens on current (2000) versions of GNU/Linux
-  with gdb 5.0.)
-  This function reloads them.
-end
-
-define hook-run
-  xreload
-end
-
-# Call xreload if a new Emacs executable is loaded.
-define hookpost-run
-  xreload
-end
-
-set print pretty on
-set print sevenbit-strings
-
-# show environment DISPLAY
-# show environment TERM
-# set args -geometry 80x40+0+0
-
-# Don't let abort actually run, as it will make
-# stdio stop working and therefore the `pr' command above as well.
-# break abort
-
-# If we are running in synchronous mode, we want a chance to look around
-# before Emacs exits.  Perhaps we should put the break somewhere else
-# instead...
-# break x_error_quitter
-
-# arch-tag: 08f4d20d-0254-4374-a80c-179d5a517915
diff --git a/src/ChangeLog b/src/ChangeLog
index 2c2ab0041be..6c92bf7cd88 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,196 +1,3 @@
-2003-09-03  Kim F. Storm  <storm@cua.dk>
-
-        * xdisp.c (get_window_cursor_type): Partially undo 2002-03-01
-        change (superseded by 2002-08-30 change); the default blink-off
-        cursor is now again "no cursor".
-
-2003-09-01  Jason Rumney  <jasonr@gnu.org>
-
-        * makefile.w32-in (alloca.o): Remove.
-        (coding.o): Depend on intervals.h
-        (emacs.o, bytecode.o): Depend on window.h
-
-2003-09-01  Dave Love  <fx@gnu.org>
-
-        * Makefile.in (alloca.o): Remove commands.
-        (coding.o): Depend on intervals.h composite.h window.h.
-        (emacs.o): Depend on window.h keyboard.h keymap.h.
-        (gtkutil.o): Depend on keyboard.h charset.h coding.h.
-        (bytecode.o): Depend on window.h.
-
-2003-08-31  Jason Rumney  <jasonr@gnu.org>
-
-        * w32term.c (w32_per_char_metric): Allow cached metrics to be
-        returned even when font_type is unknown.
-
-        * xdisp.c (init_iterator): Remove old WINDOWSNT conditional.
-
-2003-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-
-        * xterm.c (x_term_init): Initialize new fields in x_display_info.
-
-        * xterm.h (struct x_display_info): Add red/green/blue_bits and
-        *_offset.
-
-        * xfns.c (lookup_rgb_color): Use new fields in x_display_info to
-        calculate pixel value.
-
-2003-08-29  Gerd Moellmann  <gerd.moellmann@t-online.de>
-
-        * xdisp.c (redisplay_internal): Fix change of 2003-04-30.  Don't
-        tell redisplay display is accurate when it's actually been paused
-        for pending input.
-
-2003-08-29  Richard M. Stallman  <rms@gnu.org>
-
-        * dispnew.c (adjust_glyph_matrix): Call window_box
-        whenever W is nonzero.
-
-        * data.c (Fmake_variable_buffer_local, Fmake_local_variable)
-        (Fkill_local_variable, Fmake_variable_frame_local)
-        (Flocal_variable_p, Flocal_variable_if_set_p): 
-        Use indirect_variable to trace thru variable aliases.
-
-        * config.in: Updated.
-
-        * callint.c (Fcall_interactively): Save and restore
-        Vthis_command, Vthis_original_command, real_this_command,
-        and current_kboard->Vlast_command.
-
-        * abbrev.c (Fexpand_abbrev): Insert before deleting.
-
-2003-08-29  Gerd Moellmann  <gerd@gnu.org>
-
-        * xfns.c (lookup_rgb_color): Handle TrueColor visuals specially.
-
-2003-08-28  David Abrahams  <dave@boost-consulting.com>  (tiny change)
-
-        * coding.c (decode_coding_iso2022): Initialized local variable c2.
-        (decode_coding_sjis_big5): Likewise.
-
-2003-08-27  Jason Rumney  <jasonr@gnu.org>
-
-        * w32.c (sys_pipe): Protect against file descriptor overflow.
-
-        * w32fns.c (syms_of_w32fns): Remove non-existent functions.
-
-        * w32term.c (w32_read_socket): Fix WM_MOUSEWHEEL assignment.
-
-2003-08-26  Terje Rosten <terjeros@phys.ntnu.no>
-
-        * xfns.c (Vgtk_version_string): New variable.
-        (syms_of_xfns): DEFVAR_LISP it.  Provide gtk.
-
-2003-08-24  Eli Zaretskii  <eliz@elta.co.il>
-
-        * term.c (term_init): Remove `const' from buffer_size's
-        declaration.
-
-        * Makefile.in (msdos.o): Depend on intervals.h.
-
-        * msdos.c: Include intervals.h, since STRING_INTERVALS requires
-        that.
-
-2003-08-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
-
-        * xterm.h (struct x_display_info): New fields: client_leader_window
-        and Xatom_wm_client_leader.
-
-        * xterm.c (x_initialize): Move call to x_session_initialize to ...
-        (x_term_init): ... here.  Initialize client_leader fields in dpyinfo.
-
-        * xsmfns.c (create_client_leader_window): New function.
-        (x_session_initialize): Call create_client_leader_window, take
-        dpyinfo as argument.
-
-        * xfns.c (Fx_create_frame): Set property WM_CLIENT_LEADER.
-
-        * Makefile.in (xsmfns.o): Add more depenedencies.
-
-2003-08-21  Dave Love  <fx@gnu.org>
-
-        * m/iris4d.h: Use _MIPS_SZLONG, not _LP64.
-
-2003-08-21  Kenichi Handa  <handa@m17n.org>
-
-        * term.c (term_init): Fix previous change; don't rely on the
-        length of `buffer' if TERMINFO is defined.
-
-2003-08-20  Dave Love  <fx@gnu.org>
-
-        * atimer.h: Include lisp.h.
-
-        * lisp.h (EMACS_LISP_H): New.
-        (popup_activated_flag): Don't declare.
-
-        * alloca.c: Some merging with gnulib.  Change logic and doc
-        concerning (x)malloc/(x)free -- no longer Emacs-specific.
-        [DO_BLOCK_INPUT]: Don't include lisp.h.
-        (xmalloc, xfree): Declare.
-        (malloc): Don't declare.
-
-        * Makefile.in (LWLIB_OPTIONS): Removed (unused).
-        (alloca.o): Remove obsolete stuff concerning alloca.s.  Depend on
-        atimer.h, blockinput.h.
-
-        * alloc.c (lisp_align_malloc): Change type of `aligned'.
-
-        * alloca.s: Removed.
-
-2003-08-19  Gerd Moellmann  <gerd@gnu.org>
-
-        * s/freebsd.h [__FreeBSD_version >= 400000]: Define TERMINFO,
-        use -lncurses.
-
-        * term.c (term_init): Use a buffer of size 4096 for tgetent since
-        FreeBSD returns something longer than 2044.  Abort if the end of
-        the buffer is overwritten.
-
-2003-08-19  Miles Bader  <miles@gnu.org>
-
-        * xterm.c (x_term_init): Correctly use result of Ffile_readable_p.
-
-2003-08-19  Gerd Moellmann  <gerd@gnu.org>
-
-        * alloc.c (lisp_align_malloc): Check for memory full when
-        allocating ablocks, which also avoids freeing a pointer into an
-        ablocks structure.
-
-        * puresize.h (BASE_PURESIZE): Increase to 1100000.
-
-        * buffer.c (Fmove_overlay): Set overlay's next pointer
-        unconditionally.
-
-2003-08-16  Richard M. Stallman  <rms@gnu.org>
-
-        * editfns.c (Fencode_time): Doc fix.
-
-2003-08-16  David Ponce  <david@dponce.com>
-
-        * fileio.c (Fwrite_region): Fix conditional expression to issue
-        the right message.
-
-2003-08-16  Juri Linkov  <juri@jurta.org>  (tiny change)
-
-        * syntax.c (Fforward_word): Argument changed to optional.
-        Set default value to 1.
-
-2003-08-15  Kenichi Handa  <handa@m17n.org>
-
-        * xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
-        what autoscaled.
-        (best_matching_font): Once we find a better scalable font, set
-        non_scalable_has_exact_height_p to 1.
-        (try_font_list): Call try_alternative_families to try any family
-        with the given registry.
-
-2003-08-09  Andreas Schwab  <schwab@suse.de>
-
-        * alloc.c (mark_object): Handle Lisp_Misc_Save_Value.
-
-        * print.c (print_string): Fix printing of multibyte string with
-        nontrivial printcharfun.
-
 2003-07-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
@@ -10705,5 +10512,3 @@ See ChangeLog.9 for earlier changes.
     Copyright (C) 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 5dcc435f-4038-4141-b3bf-5be51cd76bd4
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 94f1039f71e..3ffbd61f607 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3525,5 +3525,3 @@
     Copyright (C) 1985, 1986 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 430cbc0f9da..edbbfd3a7c0 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4774,5 +4774,3 @@ See ChangeLog.1 for earlier changes.
     Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 73f87793541..a93f4ab9825 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16534,5 +16534,3 @@ See ChangeLog.2 for earlier changes.
     Copyright (C) 1993 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 136a8e5c-4f83-403b-9132-874f1c47f8a9
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index b3d40b96b6c..36ec0081a62 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6906,5 +6906,3 @@ See ChangeLog.3 for earlier changes.
     Copyright (C) 1993, 1994 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 2e44924a-e45a-4129-ad93-1f7bb410b609
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 20fc4887084..1f20b6812f7 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7147,5 +7147,3 @@ See ChangeLog.4 for earlier changes.
     Copyright (C) 1994, 1995 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: aea244d6-d513-4b51-8dba-5ecdf1aa5875
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 52e48cac275..3cf30f682e3 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5365,5 +5365,3 @@ See ChangeLog.5 for earlier changes.
     Copyright (C) 1995, 1996 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index f1a29903715..99631e5eefa 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11101,5 +11101,3 @@ See ChangeLog.6 for earlier changes.
     Copyright (C) 1997, 1998 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 91fcdd1c899..1c2f7820bb5 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13994,5 +13994,3 @@ See ChangeLog.7 for earlier changes.
     Copyright (C) 1999 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 4d73444a-8f6e-4255-92a6-d3abc438b8d3
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 9ce75696f5a..224b8384f5a 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13297,5 +13297,3 @@ See ChangeLog.8 for earlier changes.
     Copyright (C) 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: 38875948-6e89-4f08-b0ca-ff328f1e8b72
diff --git a/src/Makefile.in b/src/Makefile.in
index 1af4fa22155..1961dfcdb13 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -944,6 +944,11 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h)
 #define OLDXMENU_OPTIONS
 #endif
 
+/* Don't lose if this was not defined.  */
+#ifndef LWLIB_OPTIONS
+#define LWLIB_OPTIONS
+#endif
+
 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
 
 /* We use stamp-xmenu with these two deps
@@ -967,7 +972,7 @@ C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
 really-lwlib:
-        cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
+        cd ${lwlibdir}; ${MAKE} ${MFLAGS} LWLIB_OPTIONS \
     CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
     "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
     "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
@@ -1018,10 +1023,40 @@ stamp-oldxmenu:
         exit 1
 
 /* Some machines have alloca built-in.
-   They should define HAVE_ALLOCA.
+   They should define HAVE_ALLOCA, or may just let alloca.s
+   be used but generate no code.
+   Some have it written in assembler in alloca.s.
    Some use the C version in alloca.c (these define C_ALLOCA in config.h).
    */
-alloca.o: alloca.c blockinput.h atimer.h
+
+#ifdef C_ALLOCA
+/* We could put something in alloca.c to #define free and malloc
+   whenever emacs was #defined, but that's not appropriate for all
+   users of alloca in Emacs.  Check out ../lib-src/getopt.c.  */
+alloca.o : alloca.c
+        $(CC) -c $(CPPFLAGS) -DEMACS_FREE=xfree -DDO_BLOCK_INPUT \
+        $(ALL_CFLAGS) ${srcdir}/alloca.c
+#else
+#ifndef HAVE_ALLOCA
+alloca.o : alloca.s $(config_h)
+/* $(CPP) is cc -E, which may get confused by filenames
+   that do not end in .c.  So copy file to a safe name.  */
+        -rm -f allocatem.c
+        cp ${srcdir}/alloca.s allocatem.c
+/* Remove any ^L, blank lines, and preprocessor comments,
+   since some assemblers barf on them.  Use a different basename for the
+   output file, since some stupid compilers (Green Hill's) use that
+   name for the intermediate assembler file. */
+        $(CPP) $(CPPFLAGS) $(ALL_CFLAGS) allocatem.c | \
+        sed -e 's///' -e 's/^#.*//' | \
+        sed -n -e '/^..*$$/p' > allocax.s
+        -rm -f alloca.o
+/* Xenix, in particular, needs to run assembler via cc.  */
+        $(CC) -c allocax.s
+        mv allocax.o alloca.o
+        -rm -f allocax.s allocatem.c
+#endif /* HAVE_ALLOCA */
+#endif /* ! defined (C_ALLOCA) */
 
 /* Nearly all the following files depend on lisp.h,
    but it is not included as a dependency because
@@ -1044,7 +1079,7 @@ category.o: category.c category.h buffer.h charset.h $(config_h)
 ccl.o: ccl.c ccl.h charset.h coding.h $(config_h)
 charset.o: charset.c charset.h buffer.h coding.h composite.h disptab.h \
         $(config_h)
-coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h window.h $(config_h)
+coding.o: coding.c coding.h ccl.h buffer.h charset.h $(config_h)
 cm.o: cm.c cm.h termhooks.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \
         msdos.h dispextern.h
@@ -1064,8 +1099,7 @@ dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h)
 editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \
    coding.h dispextern.h $(config_h)
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
-   termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \
-   window.h keyboard.h keymap.h
+   termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h)
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \
    coding.h ccl.h msdos.h dispextern.h $(config_h)
 filelock.o: filelock.c buffer.h systime.h epaths.h $(config_h)
@@ -1101,7 +1135,7 @@ minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \
-   keyboard.h intervals.h $(config_h)
+   keyboard.h $(config_h)
 process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
    blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
@@ -1153,10 +1187,9 @@ xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
   buffer.h atimer.h systime.h $(config_h)
 xrdb.o: xrdb.c $(config_h) epaths.h
-xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \
-  lisp.h termopts.h
+xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h
 gtkutil.o:  gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \
-  blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h
+  blockinput.h window.h atimer.h termhooks.h
 
 hftctl.o: hftctl.c $(config_h)
 sound.o: sound.c dispextern.h $(config_h)
@@ -1166,7 +1199,7 @@ atimer.o: atimer.c atimer.h systime.h $(config_h)
 
 alloc.o: alloc.c process.h frame.h window.h buffer.h  puresize.h syssignal.h keyboard.h \
  blockinput.h atimer.h systime.h charset.h dispextern.h $(config_h) $(INTERVAL_SRC)
-bytecode.o: bytecode.c buffer.h syntax.h charset.h window.h $(config_h)
+bytecode.o: bytecode.c buffer.h syntax.h charset.h $(config_h)
 data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h $(config_h)
 eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
   $(config_h)
@@ -1313,5 +1346,3 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
         mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */
 
-/* arch-tag: 8e915ae5-d15d-4617-8c41-c5c267a23b00
-   (do not change this comment) */
diff --git a/src/abbrev.c b/src/abbrev.c
index 1cf06946631..dabc03b2a55 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -356,13 +356,10 @@ Returns the abbrev symbol, if expansion took place.  */)
     {
       SET_PT (wordstart);
 
+      del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);
+
       insert_from_string (expansion, 0, 0, SCHARS (expansion),
                           SBYTES (expansion), 1);
-      del_range_both (PT, PT_BYTE,
-                      wordend + (PT - wordstart),
-                      wordend_byte + (PT_BYTE - wordstart_byte),
-                      1);
-
       SET_PT (PT + whitecnt);
 
       if (uccount && !lccount)
@@ -693,6 +690,3 @@ the current abbrev table before abbrev lookup happens.  */);
   defsubr (&Sinsert_abbrev_table_description);
   defsubr (&Sdefine_abbrev_table);
 }
-
-/* arch-tag: b721db69-f633-44a8-a361-c275acbdad7d
-   (do not change this comment) */
diff --git a/src/acldef.h b/src/acldef.h
index eee3e72a3e9..cc4085c6aab 100644
--- a/src/acldef.h
+++ b/src/acldef.h
@@ -38,6 +38,3 @@
 #define ACL$W_SIZE      8
 #define ACL$B_TYPE      10
 #define ACL$L_LIST      12
-
-/* arch-tag: 7c11e99d-34df-41e8-98e2-20f152c4ad73
-   (do not change this comment) */
diff --git a/src/alloc.c b/src/alloc.c
index f73edcd70e9..102bc637b58 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -552,7 +552,7 @@ xrealloc (block, size)
 }
 
 
-/* Like free but block interrupt input.  */
+/* Like free but block interrupt input..  */
 
 void
 xfree (block)
@@ -738,8 +738,7 @@ lisp_align_malloc (nbytes, type)
 
   if (!free_ablock)
     {
-      int i;
-      EMACS_INT aligned; /* int gets warning casting to 64-bit pointer.  */
+      int i, aligned;
 
 #ifdef DOUG_LEA_MALLOC
       /* Prevent mmap'ing the chunk.  Lisp data may not be mmap'ed
@@ -767,23 +766,6 @@ lisp_align_malloc (nbytes, type)
       mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
 #endif
 
-      /* If the memory just allocated cannot be addressed thru a Lisp
-         object's pointer, and it needs to be, that's equivalent to
-         running out of memory.  */
-      if (type != MEM_TYPE_NON_LISP)
-        {
-          Lisp_Object tem;
-          char *end = (char *) base + ABLOCKS_BYTES - 1;
-          XSETCONS (tem, end);
-          if ((char *) XCONS (tem) != end)
-            {
-              lisp_malloc_loser = base;
-              free (base);
-              UNBLOCK_INPUT;
-              memory_full ();
-            }
-        }
-
       /* Initialize the blocks and put them on the free list.
          Is `base' was not properly aligned, we can't use the last block.  */
       for (i = 0; i < (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1); i++)
@@ -806,6 +788,21 @@ lisp_align_malloc (nbytes, type)
   val = free_ablock;
   free_ablock = free_ablock->x.next_free;
 
+  /* If the memory just allocated cannot be addressed thru a Lisp
+     object's pointer, and it needs to be,
+     that's equivalent to running out of memory.  */
+  if (val && type != MEM_TYPE_NON_LISP)
+    {
+      Lisp_Object tem;
+      XSETCONS (tem, (char *) val + nbytes - 1);
+      if ((char *) XCONS (tem) != (char *) val + nbytes - 1)
+        {
+          lisp_malloc_loser = val;
+          free (val);
+          val = 0;
+        }
+    }
+
 #if GC_MARK_STACK && !defined GC_MALLOC_CHECK
   if (val && type != MEM_TYPE_NON_LISP)
     mem_insert (val, (char *) val + nbytes, type);
@@ -5027,7 +5024,6 @@ mark_object (arg)
              since all markable slots in current buffer marked anyway.  */
           /* Don't need to do Lisp_Objfwd, since the places they point
              are protected with staticpro.  */
-        case Lisp_Misc_Save_Value:
           break;
 
         case Lisp_Misc_Overlay:
@@ -5789,6 +5785,3 @@ The time is in seconds as a floating point value.  */);
   defsubr (&Sgc_status);
 #endif
 }
-
-/* arch-tag: 6695ca10-e3c5-4c2c-8bc3-ed26a7dda857
-   (do not change this comment) */
diff --git a/src/alloca.c b/src/alloca.c
index 460d0ae9a54..4b574374bff 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -36,6 +36,7 @@
 #endif
 
 #ifdef DO_BLOCK_INPUT
+# include "lisp.h"
 # include "blockinput.h"
 #endif
 
@@ -57,10 +58,7 @@ you
 lose
 -- must know STACK_DIRECTION at compile-time
 /* Using #error here is not wise since this file should work for
-   old and obscure compilers.  
-
-   As far as I know, using it is OK if it's indented -- at least for
-   pcc-based processors.  -- fx */
+   old and obscure compilers.  */
 #    endif /* STACK_DIRECTION undefined */
 #   endif /* static */
 #  endif /* emacs */
@@ -75,32 +73,38 @@ long i00afunc ();
 #   define ADDRESS_FUNCTION(arg) &(arg)
 #  endif
 
-#  ifndef POINTER_TYPE
-#   ifdef __STDC__
-#    define POINTER_TYPE void
-#   else
-#    define POINTER_TYPE char
-#   endif
-#  endif
+#  ifdef POINTER_TYPE
 typedef POINTER_TYPE *pointer;
+#  else /* not POINTER_TYPE */
+#   if __STDC__
+typedef void *pointer;
+#   else /* not __STDC__ */
+typedef char *pointer;
+#   endif /* not __STDC__ */
+#  endif /* not POINTER_TYPE */
 
 #  ifndef NULL
 #   define NULL 0
 #  endif
 
-/* The Emacs executable needs alloca to call xmalloc, because ordinary
-   malloc isn't protected from input signals.  xmalloc also checks for
-   out-of-memory errors, so we should use it generally.
+/* Different portions of Emacs need to call different versions of
+   malloc.  The Emacs executable needs alloca to call xmalloc, because
+   ordinary malloc isn't protected from input signals.  On the other
+   hand, the utilities in lib-src need alloca to call malloc; some of
+   them are very simple, and don't have an xmalloc routine.
 
-   Callers below should use malloc.  */
+   Non-Emacs programs expect this to call xmalloc.
 
-#  undef malloc
-#  define malloc xmalloc
-#  undef free
-#  define free xfree
+   Callers below should use malloc.  */
 
-void *xmalloc _P ((size_t));
-void xfree _P ((void *))
+#  ifdef emacs
+#   undef malloc
+#   define malloc xmalloc
+#   ifdef EMACS_FREE
+#    define free EMACS_FREE
+#   endif
+#  endif
+extern pointer malloc ();
 
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically
@@ -225,8 +229,8 @@ alloca (size)
   /* Allocate combined header + user data storage.  */
 
   {
-    /* Address of header.  */
     register pointer new = malloc (sizeof (header) + size);
+    /* Address of header.  */
 
     if (new == 0)
       abort();
@@ -512,6 +516,3 @@ i00afunc (long address)
 
 # endif /* no alloca */
 #endif /* not GCC version 2 */
-
-/* arch-tag: 5c9901c8-3cd4-453e-bd66-d9035a175ee3
-   (do not change this comment) */
diff --git a/src/atimer.c b/src/atimer.c
index 6b0e0777886..25b48c5857a 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -433,6 +433,3 @@ init_atimer ()
   pending_atimers = 0;
   signal (SIGALRM, alarm_signal_handler);
 }
-
-/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70
-   (do not change this comment) */
diff --git a/src/atimer.h b/src/atimer.h
index f7074f383db..4a487cdbb30 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -21,9 +21,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef EMACS_ATIMER_H
 #define EMACS_ATIMER_H
 
-/* Building alloca.o includes us, and we need lisp.h for the P_ macro
-   in that case.  */
-#include "lisp.h"
 #include "systime.h"            /* for EMACS_TIME */
 
 /* Forward declaration.  */
@@ -85,6 +82,3 @@ void run_all_atimers P_ ((void));
 Lisp_Object unwind_stop_other_atimers P_ ((Lisp_Object));
 
 #endif /* EMACS_ATIMER_H */
-
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
-   (do not change this comment) */
diff --git a/src/blockinput.h b/src/blockinput.h
index eba192c9863..c5485fa4801 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -102,6 +102,3 @@ extern int pending_atimers;
 extern void reinvoke_input_signal ();
 
 #endif /* EMACS_BLOCKINPUT_H */
-
-/* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03
-   (do not change this comment) */
diff --git a/src/buffer.c b/src/buffer.c
index de466de485a..40ee3f071de 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3741,13 +3741,15 @@ buffer.  */)
   end = OVERLAY_END (overlay);
   if (OVERLAY_POSITION (end) < b->overlay_center)
     {
-      XOVERLAY (overlay)->next = b->overlays_after;
-      b->overlays_after = XOVERLAY (overlay);
+      if (b->overlays_after)
+        XOVERLAY (overlay)->next = b->overlays_after;
+    b->overlays_after = XOVERLAY (overlay);
     }
   else
     {
-      XOVERLAY (overlay)->next = b->overlays_before;
-      b->overlays_before = XOVERLAY (overlay);
+      if (b->overlays_before)
+        XOVERLAY (overlay)->next = b->overlays_before;
+    b->overlays_before = XOVERLAY (overlay);
     }
 
   /* This puts it in the right list, and in the right order.  */
@@ -5891,6 +5893,3 @@ keys_of_buffer ()
      initialized when that function gets called.  */
   Fput (intern ("erase-buffer"), Qdisabled, Qt);
 }
-
-/* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1
-   (do not change this comment) */
diff --git a/src/buffer.h b/src/buffer.h
index 14d3aa6d5ee..8c340a23d23 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -935,6 +935,3 @@ extern int last_per_buffer_idx;
 
 #define PER_BUFFER_TYPE(OFFSET) \
       (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_types))
-
-/* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1
-   (do not change this comment) */
diff --git a/src/bytecode.c b/src/bytecode.c
index a4ade9650ec..141f5adda84 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1775,6 +1775,3 @@ integer, it is incremented each time that symbol's function is called.  */);
   }
 #endif
 }
-
-/* arch-tag: b9803b6f-1ed6-4190-8adf-33fd3a9d10e9
-   (do not change this comment) */
diff --git a/src/callint.c b/src/callint.c
index 21a6bd0b1ad..4edb4201fa4 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -41,7 +41,6 @@ Lisp_Object Qcall_interactively;
 Lisp_Object Vcommand_history;
 
 extern Lisp_Object Vhistory_length;
-extern Lisp_Object Vthis_original_command, real_this_command;
 
 Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
 Lisp_Object Qenable_recursive_minibuffers;
@@ -292,14 +291,6 @@ supply if the command inquires which events were used to invoke it.  */)
   int key_count;
   int record_then_fail = 0;
 
-  Lisp_Object save_this_command, save_last_command;
-  Lisp_Object save_this_original_command, save_real_this_command;
-
-  save_this_command = Vthis_command;
-  save_this_original_command = Vthis_original_command;
-  save_real_this_command = real_this_command;
-  save_last_command = current_kboard->Vlast_command;
-
   if (NILP (keys))
     keys = this_command_keys, key_count = this_command_key_count;
   else
@@ -404,12 +395,6 @@ supply if the command inquires which events were used to invoke it.  */)
                 XSETCDR (teml, Qnil);
             }
         }
-
-      Vthis_command = save_this_command;
-      Vthis_original_command = save_this_original_command;
-      real_this_command= save_real_this_command;
-      current_kboard->Vlast_command = save_last_command;
-
       single_kboard_state ();
       return apply1 (function, specs);
     }
@@ -856,11 +841,6 @@ supply if the command inquires which events were used to invoke it.  */)
   if (record_then_fail)
     Fbarf_if_buffer_read_only ();
 
-  Vthis_command = save_this_command;
-  Vthis_original_command = save_this_original_command;
-  real_this_command= save_real_this_command;
-  current_kboard->Vlast_command = save_last_command;
-
   single_kboard_state ();
 
   {
@@ -998,6 +978,3 @@ a way to turn themselves off when a mouse command switches windows.  */);
   defsubr (&Scall_interactively);
   defsubr (&Sprefix_numeric_value);
 }
-
-/* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37
-   (do not change this comment) */
diff --git a/src/callproc.c b/src/callproc.c
index 00068a908fb..d92176ccd91 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1683,6 +1683,3 @@ See `setenv' and `getenv'.  */);
 #endif
   defsubr (&Scall_process_region);
 }
-
-/* arch-tag: 769b8045-1df7-4d2b-8968-e3fb49017f95
-   (do not change this comment) */
diff --git a/src/casefiddle.c b/src/casefiddle.c
index ae60d2c8dd5..8b92d39cbb3 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -444,6 +444,3 @@ keys_of_casefiddle ()
   initial_define_key (meta_map, 'l', "downcase-word");
   initial_define_key (meta_map, 'c', "capitalize-word");
 }
-
-/* arch-tag: 60a73c66-5489-47e7-a81f-cead4057c526
-   (do not change this comment) */
diff --git a/src/casetab.c b/src/casetab.c
index 6fc2d415fde..9f9c4f8c5b2 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -277,6 +277,3 @@ syms_of_casetab ()
   defsubr (&Sset_case_table);
   defsubr (&Sset_standard_case_table);
 }
-
-/* arch-tag: e06388ad-99fe-40ec-ba67-9d010fcc4916
-   (do not change this comment) */
diff --git a/src/category.c b/src/category.c
index 223ec20cd73..4846ae8f7f6 100644
--- a/src/category.c
+++ b/src/category.c
@@ -609,6 +609,3 @@ See the documentation of the variable `word-combining-categories'.  */);
 
   category_table_version = 0;
 }
-
-/* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211
-   (do not change this comment) */
diff --git a/src/category.h b/src/category.h
index 5607efaed6f..d48d99df805 100644
--- a/src/category.h
+++ b/src/category.h
@@ -129,6 +129,3 @@ extern Lisp_Object _temp_category_set;
    && word_boundary_p (c1, c2))
 
 extern int word_boundary_p P_ ((int, int));
-
-/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
-   (do not change this comment) */
diff --git a/src/ccl.c b/src/ccl.c
index ae42f2419c2..4a47ca063f3 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2403,6 +2403,3 @@ used by CCL.  */);
   defsubr (&Sregister_ccl_program);
   defsubr (&Sregister_code_conversion_map);
 }
-
-/* arch-tag: bb9a37be-68ce-4576-8d3d-15d750e4a860
-   (do not change this comment) */
diff --git a/src/ccl.h b/src/ccl.h
index cda611007f8..bfd4757b41a 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -101,6 +101,3 @@ extern Lisp_Object Vccl_program_table;
 extern Lisp_Object Qccl_program_idx;
 
 #endif /* EMACS_CCL_H */
-
-/* arch-tag: 14681df7-876d-43de-bc71-6b78e23a4e3c
-   (do not change this comment) */
diff --git a/src/charset.c b/src/charset.c
index 70152139352..af5c6ff7068 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1908,6 +1908,3 @@ Such characters have value t in this table.  */);
 }
 
 #endif /* emacs */
-
-/* arch-tag: 66a89b8d-4c28-47d3-9ca1-56f78440d69f
-   (do not change this comment) */
diff --git a/src/charset.h b/src/charset.h
index 3a4eb5cbfcc..fd8905e47d8 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -870,6 +870,3 @@ extern Lisp_Object Vauto_fill_chars;
   } while (0)
 
 #endif /* EMACS_CHARSET_H */
-
-/* arch-tag: 3b96db55-4961-481d-ac3e-219f46a2b3aa
-   (do not change this comment) */
diff --git a/src/chpdef.h b/src/chpdef.h
index a1bdfb7ff82..43f7bbf4345 100644
--- a/src/chpdef.h
+++ b/src/chpdef.h
@@ -36,6 +36,3 @@
 #define CHP$V_READ      0
 #define CHP$V_WRITE     1
 #define CHP$V_USEREADALL        2
-
-/* arch-tag: a7117984-e927-4f8e-932e-35d5fd524f12
-   (do not change this comment) */
diff --git a/src/cm.c b/src/cm.c
index dcff5048460..5657062b5b3 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -460,6 +460,3 @@ Wcm_init ()
     return - 2;
   return 0;
 }
-
-/* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4
-   (do not change this comment) */
diff --git a/src/cm.h b/src/cm.h
index 5500c5ce58e..5619ab28143 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -168,6 +168,3 @@ extern void cmcostinit ();
 extern void cmgoto ();
 extern void Wcm_clear ();
 extern int Wcm_init ();
-
-/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
-   (do not change this comment) */
diff --git a/src/cmds.c b/src/cmds.c
index 02e9e723881..4d7228e88ad 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -620,6 +620,3 @@ keys_of_cmds ()
   initial_define_key (global_map, Ctl ('F'), "forward-char");
   initial_define_key (global_map, 0177, "delete-backward-char");
 }
-
-/* arch-tag: 022ba3cd-67f9-4978-9c5d-7d2b18d8644e
-   (do not change this comment) */
diff --git a/src/coding.c b/src/coding.c
index 6d36cc397c6..b06bf79a4bf 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1823,7 +1823,7 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
 
   while (1)
     {
-      int c1, c2 = 0;
+      int c1, c2;
 
       src_base = src;
       ONE_MORE_BYTE (c1);
@@ -3050,7 +3050,7 @@ decode_coding_sjis_big5 (coding, source, destination,
   coding->produced_char = 0;
   while (1)
     {
-      int c, charset, c1, c2 = 0;
+      int c, charset, c1, c2;
 
       src_base = src;
       ONE_MORE_BYTE (c1);
@@ -7881,5 +7881,3 @@ emacs_strerror (error_number)
 
 #endif /* emacs */
 
-/* arch-tag: 3a3a2b01-5ff6-4071-9afe-f5b808d9229d
-   (do not change this comment) */
diff --git a/src/coding.h b/src/coding.h
index bc8af2cc4a2..4d020d31521 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -729,6 +729,3 @@ extern Lisp_Object Vdefault_file_name_coding_system;
 extern Lisp_Object Qcoding_system_error;
 
 #endif /* EMACS_CODING_H */
-
-/* arch-tag: 2bc3b4fa-6870-4f64-8135-b962b2d290e4
-   (do not change this comment) */
diff --git a/src/commands.h b/src/commands.h
index f7831bc36a9..d830573b58b 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -90,6 +90,3 @@ extern int update_mode_lines;
    so put cursor on minibuffer after the prompt.  */
 
 extern int cursor_in_echo_area;
-
-/* arch-tag: 4f7ca0b7-6a56-4b20-8bf5-b67a99921d1d
-   (do not change this comment) */
diff --git a/src/composite.c b/src/composite.c
index ef4318f5442..cc05a869126 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -896,6 +896,3 @@ the composition gets invalid after a change in a buffer.  */);
   defsubr (&Scompose_string_internal);
   defsubr (&Sfind_composition_internal);
 }
-
-/* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272
-   (do not change this comment) */
diff --git a/src/composite.h b/src/composite.h
index 5343dd51469..620d5d4ce28 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -212,6 +212,3 @@ extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object,
 extern void compose_chars_in_text P_ ((int, int, Lisp_Object));
 
 #endif /* not EMACS_COMPOSITE_H */
-
-/* arch-tag: 59524d89-c645-47bd-b5e6-65e861690118
-   (do not change this comment) */
diff --git a/src/config.in b/src/config.in
index 5507ded42eb..548210e80b4 100644
--- a/src/config.in
+++ b/src/config.in
@@ -627,9 +627,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you're using XFree386. */
 #undef HAVE_XFREE386
 
-/* Define to 1 if XIM is available */
-#undef HAVE_XIM
-
 /* Define to 1 if you have the XkbGetKeyboard function. */
 #undef HAVE_XKBGETKEYBOARD
 
diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s
index 615837eaeb4..cf973b1708f 100644
--- a/src/cxux-crt0.s
+++ b/src/cxux-crt0.s
@@ -36,6 +36,3 @@ __start:
         .data
         .globl _data_start
 _data_start:    .space 4
-
-/* arch-tag: ba84e4dc-615d-4a81-898c-f5b98ec71c9d
-   (do not change this comment) */
diff --git a/src/data.c b/src/data.c
index af635bf77be..d18cb187f62 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1449,7 +1449,6 @@ The function `default-value' gets the default value and `set-default' sets it.
   register Lisp_Object tem, valcontents, newval;
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
   if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
@@ -1503,7 +1502,6 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
   register Lisp_Object tem, valcontents;
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
   if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
@@ -1583,7 +1581,6 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
   register Lisp_Object tem, valcontents;
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
 
@@ -1648,7 +1645,6 @@ See `modify-frame-parameters' for how to set frame parameters.  */)
   register Lisp_Object tem, valcontents, newval;
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
   if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
@@ -1698,7 +1694,6 @@ BUFFER defaults to the current buffer.  */)
     }
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
   if (BUFFER_LOCAL_VALUEP (valcontents)
@@ -1743,7 +1738,6 @@ BUFFER defaults to the current buffer.  */)
     }
 
   CHECK_SYMBOL (variable);
-  variable = indirect_variable (variable);
 
   valcontents = SYMBOL_VALUE (variable);
 
@@ -3264,6 +3258,3 @@ init_data ()
   signal (SIGEMT, arith_error);
 #endif /* uts */
 }
-
-/* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7
-   (do not change this comment) */
diff --git a/src/dired.c b/src/dired.c
index 00e5a6587ce..bf2a0e4e020 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1029,6 +1029,3 @@ This variable does not affect lists of possible completions,
 but does affect the commands that actually do completions.  */);
   Vcompletion_ignored_extensions = Qnil;
 }
-
-/* arch-tag: 1ac8deca-4d8f-4d41-ade9-089154d98c03
-   (do not change this comment) */
diff --git a/src/dispextern.h b/src/dispextern.h
index d38f3d34275..3fc33f55a67 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2778,6 +2778,3 @@ extern Lisp_Object x_default_parameter P_ ((struct frame *, Lisp_Object,
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #endif /* not DISPEXTERN_H_INCLUDED */
-
-/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65
-   (do not change this comment) */
diff --git a/src/dispnew.c b/src/dispnew.c
index 535ab474373..88f6a452236 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -625,23 +625,20 @@ adjust_glyph_matrix (w, matrix, x, y, dim)
   int left = -1, right = -1;
   int window_width = -1, window_height;
 
-  /* See if W had a header line that has disappeared now, or vice versa.
-     Get W's size.  */
+  /* See if W had a header line that has disappeared now, or vice versa.  */
   if (w)
     {
-      window_box (w, -1, 0, 0, &window_width, &window_height);
-
       header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
       header_line_changed_p = header_line_p != matrix->header_line_p;
     }
   matrix->header_line_p = header_line_p;
 
-  /* If POOL is null, MATRIX is a window matrix for window-based redisplay.
-     Do nothing if MATRIX' size, position, vscroll, and marginal areas
+  /* Do nothing if MATRIX' size, position, vscroll, and marginal areas
      haven't changed.  This optimization is important because preserving
      the matrix means preventing redisplay.  */
   if (matrix->pool == NULL)
     {
+      window_box (w, -1, 0, 0, &window_width, &window_height);
       left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);
       right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols);
       xassert (left >= 0 && right >= 0);
@@ -726,8 +723,7 @@ adjust_glyph_matrix (w, matrix, x, y, dim)
   else
     {
       /* If MATRIX->pool is null, MATRIX is responsible for managing
-         its own memory.  It is a window matrix for window-based redisplay.
-         Allocate glyph memory from the heap.  */
+         its own memory.  Allocate glyph memory from the heap.  */
       if (dim.width > matrix->matrix_w
           || new_rows
           || header_line_changed_p
@@ -6725,6 +6721,3 @@ See `buffer-display-table' for more information.  */);
       Vwindow_system_version = Qnil;
     }
 }
-
-/* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413
-   (do not change this comment) */
diff --git a/src/disptab.h b/src/disptab.h
index d3bf54ea4fe..526b1c4a9d3 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -99,6 +99,3 @@ extern Lisp_Object Vglyph_table;
 #define NULL_GLYPH 00
 
 #define GLYPH_FROM_CHAR(c) (c)
-
-/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
-   (do not change this comment) */
diff --git a/src/doc.c b/src/doc.c
index 0e22f6d1059..c7b6d874013 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -927,6 +927,3 @@ syms_of_doc ()
   defsubr (&Ssnarf_documentation);
   defsubr (&Ssubstitute_command_keys);
 }
-
-/* arch-tag: 56281d4d-6949-43e2-be2e-f6517de744ba
-   (do not change this comment) */
diff --git a/src/doprnt.c b/src/doprnt.c
index 8137af28896..72c0dd490e8 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -334,6 +334,3 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
   *bufptr = 0;          /* Make sure our string end with a '\0' */
   return bufptr - buffer;
 }
-
-/* arch-tag: aa0ab528-7c5f-4c73-894c-aa2526a1efb3
-   (do not change this comment) */
diff --git a/src/dosfns.c b/src/dosfns.c
index d9714693507..b2200ee507b 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -651,6 +651,3 @@ If zero, the decimal point key returns the country code specific value.  */);
   dos_decimal_point = 0;
 }
 #endif /* MSDOS */
-
-/* arch-tag: f5ea8847-a014-42c9-83f5-7738ad640b17
-   (do not change this comment) */
diff --git a/src/dosfns.h b/src/dosfns.h
index 24d214fc1b3..00e2e1ed1a3 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -43,6 +43,3 @@ extern Lisp_Object Vdos_display_scancodes;
 extern int         msdos_stdcolor_idx  P_ ((const char *));
 extern Lisp_Object msdos_stdcolor_name P_ ((int));
 #endif
-
-/* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
-   (do not change this comment) */
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 209748c8c9e..17bd4841002 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -610,6 +610,3 @@ char *__progname;
 char *__progname;
 #endif
 #endif /* __bsdi__ */
-
-/* arch-tag: 4025c2fb-d6b1-4d29-b1b6-8100b6bd1e74
-   (do not change this comment) */
diff --git a/src/editfns.c b/src/editfns.c
index b057795f2ed..97a939ce43b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1665,9 +1665,6 @@ for example, a DAY of 0 means the day preceding the given month.
 Year numbers less than 100 are treated just like other year numbers.
 If you want them to stand for years in this century, you must do that yourself.
 
-Years before 1970 are not guaranteed to work.  On some systems,
-year values as low as 1901 do work.
-
 usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
      (nargs, args)
      int nargs;
@@ -4307,6 +4304,3 @@ functions if all the text being accessed has this property.  */);
   defsubr (&Ssave_restriction);
   defsubr (&Stranspose_regions);
 }
-
-/* arch-tag: fc3827d8-6f60-4067-b11e-c3218031b018
-   (do not change this comment) */
diff --git a/src/emacs.c b/src/emacs.c
index 62f16877184..05897e9bb44 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2399,6 +2399,3 @@ near where the Emacs executable was found.  */);
                doc: /* Most recently used system locale for time.  */);
   Vprevious_system_time_locale = Qnil;
 }
-
-/* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e
-   (do not change this comment) */
diff --git a/src/epaths.in b/src/epaths.in
index 00a1a1d04f5..2e7126c328a 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -59,6 +59,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Where Emacs should look for the application default file. */
 #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-
-/* arch-tag: d30686c4-629c-4666-9499-beaa69f1641e
-   (do not change this comment) */
diff --git a/src/eval.c b/src/eval.c
index 9e2ab1b1337..5061cbc7667 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3432,6 +3432,3 @@ The value the function returns is not used.  */);
   defsubr (&Sbacktrace);
   defsubr (&Sbacktrace_frame);
 }
-
-/* arch-tag: 014a07aa-33ab-4a8f-a3d2-ee8a4a9ff7fb
-   (do not change this comment) */
diff --git a/src/fileio.c b/src/fileio.c
index 9ed46109951..a44552010c7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5223,7 +5223,7 @@ This does code conversion according to the value of
     return Qnil;
 
   if (!auto_saving)
-    message_with_string ((INTEGERP (append)
+    message_with_string ((! INTEGERP (append)
                           ? "Updated %s"
                           : ! NILP (append)
                           ? "Added to %s"
@@ -6591,6 +6591,3 @@ a non-nil value.  */);
   defsubr (&Sunix_sync);
 #endif
 }
-
-/* arch-tag: 64ba3fd7-f844-4fb2-ba4b-427eb928786c
-   (do not change this comment) */
diff --git a/src/filelock.c b/src/filelock.c
index cbf3f860a92..bcad75199cd 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -770,6 +770,3 @@ syms_of_filelock ()
 }
 
 #endif /* CLASH_DETECTION */
-
-/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1
-   (do not change this comment) */
diff --git a/src/filemode.c b/src/filemode.c
index 058880d6699..d804e94d73c 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -254,6 +254,3 @@ setst (bits, chars)
     }
 #endif
 }
-
-/* arch-tag: 4340830c-15a5-47d2-b45f-1d43c45a91bb
-   (do not change this comment) */
diff --git a/src/firstfile.c b/src/firstfile.c
index faa192257ba..295c9b7ff65 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -33,5 +33,3 @@ extern int initialized;
 static int * dummy = &initialized;
 #endif
 
-/* arch-tag: a6c0d2dd-00c3-4ba5-95a5-9c8ab82f39b2
-   (do not change this comment) */
diff --git a/src/floatfns.c b/src/floatfns.c
index 84a2dac7df6..b7d6412fdbf 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1075,6 +1075,3 @@ syms_of_floatfns ()
   defsubr (&Sround);
   defsubr (&Struncate);
 }
-
-/* arch-tag: be05bf9d-049e-4e31-91b9-e6153d483ae7
-   (do not change this comment) */
diff --git a/src/fns.c b/src/fns.c
index dbf6735f944..9ee15ff4994 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5712,6 +5712,3 @@ init_fns ()
 {
   Vweak_hash_tables = Qnil;
 }
-
-/* arch-tag: 787f8219-5b74-46bd-8469-7e1cc475fa31
-   (do not change this comment) */
diff --git a/src/fontset.c b/src/fontset.c
index 608bdec83d4..a23a146c76d 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1515,6 +1515,3 @@ at the vertical center of lines.  */);
   defsubr (&Sfontset_font);
   defsubr (&Sfontset_list);
 }
-
-/* arch-tag: ea861585-2f5f-4e5b-9849-d04a9c3a3537
-   (do not change this comment) */
diff --git a/src/fontset.h b/src/fontset.h
index 36367becb3d..634711110bc 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -236,6 +236,3 @@ extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
 #endif /* EMACS_FONTSET_H */
-
-/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
-   (do not change this comment) */
diff --git a/src/frame.c b/src/frame.c
index abba478037f..98b3e7067bd 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4134,6 +4134,3 @@ This variable is local to the current terminal and cannot be buffer-local.  */);
 #endif
 
 }
-
-/* arch-tag: 7dbf2c69-9aad-45f8-8296-db893d6dd039
-   (do not change this comment) */
diff --git a/src/frame.h b/src/frame.h
index 0b758fccca7..a2ca24a014d 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1078,6 +1078,3 @@ extern void validate_x_resource_name P_ ((void));
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #endif /* not EMACS_FRAME_H */
-
-/* arch-tag: 0df048ee-e6bf-4f48-bd56-e3cd055dd8c4
-   (do not change this comment) */
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 9a104cee7d8..462ee16fa54 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1036,6 +1036,3 @@ main (argc, argv)
   exit (0);
 }
 #endif /* TEST */
-
-/* arch-tag: 2b37a242-6289-41f4-8cd5-0e73fd615db1
-   (do not change this comment) */
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 269a2ff17fd..4d526183393 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -57,6 +57,3 @@ Boston, MA 02111-1307, USA.  */
 # endif /* no _SC_PAGESIZE */
 
 #endif /* no HAVE_GETPAGESIZE */
-
-/* arch-tag: ff6206e3-97e2-4763-923a-e84bf28eabbc
-   (do not change this comment) */
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 99fa36d073a..7c654e1ece1 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1978,6 +1978,3 @@ mprobe (__ptr_t ptr)
 }
 
 #endif /* GC_MCHECK */
-
-/* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e
-   (do not change this comment) */
diff --git a/src/gnu.h b/src/gnu.h
index 1d623431af8..b5cf7261f7d 100644
--- a/src/gnu.h
+++ b/src/gnu.h
@@ -31,6 +31,3 @@ static unsigned char gnu_bits[] = {
    0xf8, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00};
-
-/* arch-tag: b57020c7-c937-4d77-8ca6-3875178d9828
-   (do not change this comment) */
diff --git a/src/gtkutil.c b/src/gtkutil.c
index b305d1c15a0..1f92040ff69 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3275,6 +3275,3 @@ xg_initialize ()
 }
 
 #endif /* USE_GTK */
-
-/* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3
-   (do not change this comment) */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 3ede2f06ae4..a53a3fd5bdc 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -209,6 +209,3 @@ extern GtkWidget *xg_did_tearoff;
 
 #endif /* USE_GTK */
 #endif /* GTKUTIL_H */
-
-/* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72
-   (do not change this comment) */
diff --git a/src/hftctl.c b/src/hftctl.c
index 0609f840e20..272f7bad7fe 100644
--- a/src/hftctl.c
+++ b/src/hftctl.c
@@ -337,6 +337,3 @@ WR_REQ (fd, request, cmdlen, cmd, resplen)
   return (0);
 
 }
-
-/* arch-tag: cfd4f3bd-fd49-44e6-9f69-c8abdf367650
-   (do not change this comment) */
diff --git a/src/indent.c b/src/indent.c
index 0d9fe9aaf9c..e21c9a2b867 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2063,6 +2063,3 @@ Setting this variable automatically makes it local to the current buffer.  */);
   defsubr (&Svertical_motion);
   defsubr (&Scompute_motion);
 }
-
-/* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
-   (do not change this comment) */
diff --git a/src/indent.h b/src/indent.h
index 8c2d1f36adb..0ce7238ec75 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -71,5 +71,3 @@ void recompute_width_table P_ ((struct buffer *buf,
                                 struct Lisp_Char_Table *disptab));
 
 
-/* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7
-   (do not change this comment) */
diff --git a/src/insdel.c b/src/insdel.c
index 88bf1ddd085..5becd5d9163 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2281,6 +2281,3 @@ as well as hooks attached to text properties and overlays.  */);
 
   defsubr (&Scombine_after_change_execute);
 }
-
-/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d
-   (do not change this comment) */
diff --git a/src/intervals.c b/src/intervals.c
index aec80a5e561..9c6a4ef98d4 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2587,6 +2587,3 @@ set_intervals_multibyte (multi_flag)
     set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag,
                                BEG, BEG_BYTE, Z, Z_BYTE);
 }
-
-/* arch-tag: 3d402b60-083c-4271-b4a3-ebd9a74bfe27
-   (do not change this comment) */
diff --git a/src/intervals.h b/src/intervals.h
index 152b673d353..3bd05526ee2 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -361,6 +361,3 @@ extern Lisp_Object get_pos_property P_ ((Lisp_Object pos, Lisp_Object prop,
 extern void syms_of_textprop P_ ((void));
 
 #include "composite.h"
-
-/* arch-tag: f0bc16c0-b084-498d-9de4-21cc8f077795
-   (do not change this comment) */
diff --git a/src/ioctl.h b/src/ioctl.h
index 34f2a9aa644..0366f6d6bd5 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -1,4 +1 @@
 /* Emacs ioctl emulation for VMS */
-
-/* arch-tag: 48595931-af6e-407d-95c7-484059087767
-   (do not change this comment) */
diff --git a/src/keyboard.c b/src/keyboard.c
index 3dadfcedb21..ba137f67cb6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11426,6 +11426,3 @@ mark_kboards ()
       }
   }
 }
-
-/* arch-tag: 774e34d7-6d31-42f3-8397-e079a4e4c9ca
-   (do not change this comment) */
diff --git a/src/keyboard.h b/src/keyboard.h
index 32d638cc60d..9d77d21ec75 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -335,6 +335,3 @@ extern int gen_help_event P_ ((struct input_event *, int, Lisp_Object,
 extern void kbd_buffer_store_help_event P_ ((Lisp_Object, Lisp_Object));
 extern Lisp_Object menu_item_eval_property P_ ((Lisp_Object));
 extern int  kbd_buffer_events_waiting P_ ((int));
-
-/* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3
-   (do not change this comment) */
diff --git a/src/keymap.c b/src/keymap.c
index 54dd942c7e2..64f849f7845 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3783,6 +3783,3 @@ keys_of_keymap ()
   initial_define_key (global_map, 033, "ESC-prefix");
   initial_define_key (global_map, Ctl('X'), "Control-X-prefix");
 }
-
-/* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463
-   (do not change this comment) */
diff --git a/src/keymap.h b/src/keymap.h
index 2a34061593f..39265fe865e 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -52,6 +52,3 @@ typedef void (*map_keymap_function_t)
 extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload));
 
 #endif
-
-/* arch-tag: 7400d5a1-ef0b-43d0-b366-f4d678bf3ba2
-   (do not change this comment) */
diff --git a/src/lastfile.c b/src/lastfile.c
index 0e94a4f1598..e93bbc6c6ab 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -51,6 +51,3 @@ char my_endbss[1];
 static char _my_endbss[1];
 char * my_endbss_static = _my_endbss;
 #endif
-
-/* arch-tag: 67e81ab4-e14f-44b2-8875-c0c12252223e
-   (do not change this comment) */
diff --git a/src/lisp.h b/src/lisp.h
index aaa555e4fc0..9a80cb774fc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -19,9 +19,6 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef EMACS_LISP_H
-#define EMACS_LISP_H
-
 /* Declare the prototype for a general external function.  */
 #if defined (PROTOTYPES) || defined (WINDOWSNT)
 #define P_(proto) proto
@@ -2979,6 +2976,7 @@ extern Lisp_Object next_single_char_property_change P_ ((Lisp_Object,
 EXFUN (Fx_popup_menu, 2);
 EXFUN (Fx_popup_dialog, 2);
 extern void syms_of_xmenu P_ ((void));
+extern int popup_activated_flag;
 
 /* defined in sysdep.c */
 extern void stuff_char P_ ((char c));
@@ -3162,8 +3160,3 @@ extern Lisp_Object Vdirectory_sep_char;
    (FIXNUM_OVERFLOW_P (val) \
     ? make_float (val) \
     : make_number ((EMACS_INT)(val)))
-
-#endif /* EMACS_LISP_H */
-
-/* arch-tag: 9b2ed020-70eb-47ac-94ee-e1c2a5107d5e
-   (do not change this comment) */
diff --git a/src/lread.c b/src/lread.c
index 603c871c4df..0c9bc140b73 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3970,6 +3970,3 @@ to load.  See also `load-dangerous-libraries'.  */);
   Vloads_in_progress = Qnil;
   staticpro (&Vloads_in_progress);
 }
-
-/* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d
-   (do not change this comment) */
diff --git a/src/m/7300.h b/src/m/7300.h
index 17dde0c9180..3db16e67fb6 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
 /* Insist on using cc when compiling this.  GCC may have been
    configured to use GAS syntax, which causes problems.  */
 #define CRT0_COMPILE cc -c -O -Demacs
-
-/* arch-tag: 66219dc7-ef45-4f0c-bb98-f35421f39c8d
-   (do not change this comment) */
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 6f0a77be44c..38b148b3d2e 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -179,6 +179,3 @@ do
 this
 yet
 #endif
-
-/* arch-tag: acee2955-8c49-4b40-813c-579f76f4c0c3
-   (do not change this comment) */
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index 213af43266b..dabad592c39 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -124,6 +124,3 @@ unexec_text_start = hdr.a_text_addr;}
 
 /* Use the K&R version of the DEFUN macro.  */
 #define USE_NONANSI_DEFUN
-
-/* arch-tag: 8ba70b15-d082-40f6-931d-14adfd7f9dbd
-   (do not change this comment) */
diff --git a/src/m/alliant.h b/src/m/alliant.h
index c9c1c70cc95..3b79a3c1709 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -117,6 +117,3 @@ unexec_text_start = hdr.a_text_addr;}
    a variable name causes errors when compiling under ANSI C.  */
 
 #define vector xxvector
-
-/* arch-tag: 0ad5f932-f29a-4458-a24c-496cafdfd50d
-   (do not change this comment) */
diff --git a/src/m/alliant1.h b/src/m/alliant1.h
index ca597ac2762..2e061227b47 100644
--- a/src/m/alliant1.h
+++ b/src/m/alliant1.h
@@ -7,6 +7,3 @@
 
 #define ALLIANT_1
 #include "alliant.h"
-
-/* arch-tag: 516688f9-4b94-4356-9bf0-92b2d72e664e
-   (do not change this comment) */
diff --git a/src/m/alliant4.h b/src/m/alliant4.h
index 2ab0a6bde1d..7e24c53eb89 100644
--- a/src/m/alliant4.h
+++ b/src/m/alliant4.h
@@ -22,6 +22,3 @@
 
 /* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
    LOADAVG_SIZE, the number of items in the Loadavg array. */
-
-/* arch-tag: cf917b55-c95e-4079-a4d1-d31e00c61b66
-   (do not change this comment) */
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3e1d378b292..b37116b0d48 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -149,6 +149,3 @@ NOTE-END
    Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
    this avoids the assembler bug.  */
 #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
-
-/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
-   (do not change this comment) */
diff --git a/src/m/altos.h b/src/m/altos.h
index b71d006f241..654acc1d5c1 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -53,6 +53,3 @@ Boston, MA 02111-1307, USA.  */
 #ifdef __GNUC__
 #define COFF_ENCAPSULATE
 #endif
-
-/* arch-tag: 4572d0ff-70bb-445f-80f1-2bbac3cf47cb
-   (do not change this comment) */
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 37cb8c0d362..4e64d0dca85 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -134,6 +134,3 @@ extern int sign_extend_temp;
 
 /* Compensate for error in signal.h.  */
 #define NSIG_MINIMUM 20
-
-/* arch-tag: cf665976-ddb1-49b0-b383-371e17f36acf
-   (do not change this comment) */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 96ba0329631..8043ca0178b 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -114,6 +114,3 @@ Boston, MA 02111-1307, USA.  */
 
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-
-/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
-   (do not change this comment) */
diff --git a/src/m/apollo.h b/src/m/apollo.h
index e28ffef3379..83af7496e01 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -90,6 +90,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* In SR10.4, unistd.h has bad prototype for getpgrp, so we don't include it. */
 #undef HAVE_UNISTD_H
-
-/* arch-tag: 33336588-6242-4e2e-a194-e38848b12813
-   (do not change this comment) */
diff --git a/src/m/arm.h b/src/m/arm.h
index d3a95521e79..4dafe6819fa 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -48,6 +48,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_UNION_TYPE
 
 #define NO_REMAP
-
-/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
-   (do not change this comment) */
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 559ac2f3c6c..46b101dfa4c 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -144,6 +144,3 @@ extern int sign_extend_temp;
 
 /* This affects filemode.c.  */
 #define NO_MODE_T
-
-/* arch-tag: 07441a37-d630-447f-94fa-7da19645c97a
-   (do not change this comment) */
diff --git a/src/m/aviion-intel.h b/src/m/aviion-intel.h
index eb93a43214f..1f422ac0716 100644
--- a/src/m/aviion-intel.h
+++ b/src/m/aviion-intel.h
@@ -17,6 +17,3 @@
 #endif
 
 #undef  m88k                       /* It sure is NOT a Motorola machine */
-
-/* arch-tag: 7cbf89ef-237c-4da5-bdd0-8d569ae5f3ce
-   (do not change this comment) */
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 7705ef645fb..c86eb85d02c 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -121,5 +121,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define SECTION_ALIGNMENT 0x7
 
-/* arch-tag: 9de8e6ed-ddd8-4480-8308-17ddd7c86559
-   (do not change this comment) */
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 55beedb7c41..c38d144d9b4 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -54,6 +54,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* (short) negative-int doesn't sign-extend correctly */
 #define SHORT_CAST_BUG
-
-/* arch-tag: b4df1828-fab6-48f8-97bc-b8998c200eea
-   (do not change this comment) */
diff --git a/src/m/clipper.h b/src/m/clipper.h
index dc4dd0c2df8..8391d7237ef 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
 #endif /* USG */
 
 #define LD_TEXT_START_ADDR 8000
-
-/* arch-tag: 2f7981c1-7018-4a1e-b7b6-b2900de36a04
-   (do not change this comment) */
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index d44eff6700c..5f76da4bb22 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -91,6 +91,3 @@ Boston, MA 02111-1307, USA.  */
    Cause crt0.c to define errno.  */
 
 #define NEED_ERRNO
-
-/* arch-tag: 1a227f79-37e4-43af-a186-53c61296b0be
-   (do not change this comment) */
diff --git a/src/m/convex.h b/src/m/convex.h
index a871d4ac214..29797fc1314 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -183,6 +183,3 @@ Boston, MA 02111-1307, USA.  */
 /* There is some indication that the convex has sys/wait.h
    but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
-
-/* arch-tag: 127e5ae1-4f03-40c0-a87e-d2cb02c59de8
-   (do not change this comment) */
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 12b757305ba..7f227e36df9 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -111,6 +111,3 @@ Boston, MA 02111-1307, USA.  */
 /* We can't do interrupt-driven input, so don't let user try.  */
 
 #define BROKEN_SIGIO
-
-/* arch-tag: ad70aae4-1f54-4e67-8677-6eeafb9bcbd9
-   (do not change this comment) */
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 89889824fd1..0b574ef0ca4 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -157,6 +157,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_PTY_H
 
 #define USE_GETOBAUD
-
-/* arch-tag: c8ea1965-99d7-43df-ba32-29b66fc069be
-   (do not change this comment) */
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 1a2b99cdffc..282c4bd877e 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -217,5 +217,3 @@ Boston, MA 02111-1307, USA.  */
  /* end of dpx2.h */
 
 
-/* arch-tag: 8cfdf817-aec7-4d99-a00d-0e77615e8e1b
-   (do not change this comment) */
diff --git a/src/m/dual.h b/src/m/dual.h
index 392cb64eb49..d00a30d9345 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -67,6 +67,3 @@ NOTE-END */
 /* Change some things to avoid bugs in compiler */
 
 #define SWITCH_ENUM_BUG 1
-
-/* arch-tag: 7208d63c-9a23-469e-a9b1-908ac912c743
-   (do not change this comment) */
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 1795d9815d3..b392e07c5f0 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -127,6 +127,3 @@ Boston, MA 02111-1307, USA.  */
 extern int _init_brk;\
 _init_brk = bss_start;\
 }
-
-/* arch-tag: 73bf1120-a994-4c29-8d60-af425d8bf10c
-   (do not change this comment) */
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index b782542348c..5f5f9cae000 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -36,6 +36,3 @@ Boston, MA 02111-1307, USA.  */
 #undef C_DEBUG_SWITCH
 #define C_DEBUG_SWITCH -O  -KOlimit=3000 -ZXNd=5000
 #endif  /* !__GNUC__ */
-
-/* arch-tag: 27f72f54-45cd-40a3-b182-345127f04955
-   (do not change this comment) */
diff --git a/src/m/f301.h b/src/m/f301.h
index c427c19e05d..1ec0b221386 100644
--- a/src/m/f301.h
+++ b/src/m/f301.h
@@ -5,6 +5,3 @@
    USUAL-OPSYS="uxpv"  */
 
 #include "delta88k.h"
-
-/* arch-tag: a0ed4f18-ecf2-4d9a-853b-36e0f6b45945
-   (do not change this comment) */
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 145d682afb1..fcbeac3b6ca 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -103,5 +103,3 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 
-/* arch-tag: cdfd3dbf-a5e4-464d-8cef-985fb7872873
-   (do not change this comment) */
diff --git a/src/m/gould.h b/src/m/gould.h
index eeac2aef2f6..af77843a9f2 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -183,6 +183,3 @@ NOTE-END */
    with `environ' the way most standard crt0.o's do.  */
 
 #define START_FILES pre-crt0.o /lib/crt0.o
-
-/* arch-tag: 930cb9ef-f56f-4c06-aea0-5e81103bbf58
-   (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index f9052e98740..bc51b31836a 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -179,6 +179,3 @@ Boston, MA 02111-1307, USA.  */
 #define rindex strrchr
 
 #endif /* __hpux */
-
-/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
-   (do not change this comment) */
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 24c9a521d0c..ad4ca111664 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -222,6 +222,3 @@ NOTE-END */
 #endif
 
 #endif /* not BSD4_3 */
-
-/* arch-tag: 6e0001a5-ed62-4258-9235-204348f6bdb9
-   (do not change this comment) */
diff --git a/src/m/i860.h b/src/m/i860.h
index 9d56b886f62..48222538380 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -95,6 +95,3 @@ Boston, MA 02111-1307, USA.  */
 #define SVR4
 #endif
 #endif
-
-/* arch-tag: 99f3a078-95e1-49d6-8666-04726eb25647
-   (do not change this comment) */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 3ccdb02bd24..a765fab1543 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -145,6 +145,3 @@ extern void r_alloc_free ();
 #define DATA_SEG_BITS   0x6000000000000000
 
 #define HAVE_TEXT_START
-
-/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
-   (do not change this comment) */
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 3fb228afa18..32dc30089a5 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -53,6 +53,3 @@ Boston, MA 02111-1307, USA.  */
 
 #undef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE -xa
-
-/* arch-tag: 8605b600-0580-4e49-9ba9-8b4a977f860a
-   (do not change this comment) */
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index eb843ffe71b..a29d916451d 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -230,6 +230,3 @@ so disable it for them.  */
 #define LD_SWITCH_MACHINE -shlib
 #endif
 #endif
-
-/* arch-tag: 2e7f44df-6a61-4a47-aa53-f7961bfeff11
-   (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 5be14b04884..650530bf4c0 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -182,6 +182,3 @@ Boston, MA 02111-1307, USA.  */
 #define NLIST_STRUCT
 #endif
 #endif /* USG5_4 */
-
-/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
-   (do not change this comment) */
diff --git a/src/m/ibmrs6000.inp b/src/m/ibmrs6000.inp
index d7f3fddaf6f..d28a3aedae1 100644
--- a/src/m/ibmrs6000.inp
+++ b/src/m/ibmrs6000.inp
@@ -1,4 +1,2 @@
 #!
 pthread_yield
-
-# arch-tag: fc6d01ea-c488-4862-bbdb-e8d3e0f6fdb3
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 8bce9fb6f69..26803238953 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -159,6 +159,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* rocky@watson.ibm.com says this is needed.  */
 #define HAVE_FTIME
-
-/* arch-tag: eea85307-0ca9-4a9c-a4f6-89fad7591d28
-   (do not change this comment) */
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 9c262640570..587729e1418 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -117,6 +117,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Use the bitmap files that come with Emacs.  */
 #define EMACS_BITMAP_FILES
-
-/* arch-tag: 89aa7e7d-593e-432c-966a-3db6aa2ad665
-   (do not change this comment) */
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 8797a49d307..711681267a4 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -111,6 +111,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
-   (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index e240beb91a3..7f9f616d25a 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -212,6 +212,3 @@ NOTE-END */
 
 #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
 #endif
-
-/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
-   (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 4fd21da46f1..457f3594636 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -159,10 +159,7 @@ Boston, MA 02111-1307, USA.  */
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
 
-#if _MIPS_SZLONG != 64
-/* fixme: should there be 64-bit defiitions?  (The ones below aren't
-   OK.)  */
-
+#ifndef _LP64
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
 
@@ -188,6 +185,3 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #endif /* not __GNUC__ */
-
-/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
-   (do not change this comment) */
diff --git a/src/m/irist.h b/src/m/irist.h
index d2b9dd28314..b365371324f 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -130,6 +130,3 @@ NOTE-END */
 
 #define internal_with_output_to_temp_buffer     stupid_long_name1
 #define Finsert_abbrev_table_description        stupid_long_name2
-
-/* arch-tag: 4076b26c-1fe6-4c28-94f3-3c863f074767
-   (do not change this comment) */
diff --git a/src/m/is386.h b/src/m/is386.h
index 02fe12d93e5..0c89fdf91c6 100644
--- a/src/m/is386.h
+++ b/src/m/is386.h
@@ -25,6 +25,3 @@ NOTE-END  */
 #define LIBX11_MACHINE -lnsl_s
 
 #define LIBS_DEBUG -lg
-
-/* arch-tag: b6b7e6ec-8b6c-440b-b9c8-961e4bebf0cf
-   (do not change this comment) */
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index ef481e13f2b..a1ab808923a 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -90,6 +90,3 @@ NOTE-END */
 #define LIB_STANDARD -lmc -lc
 #define C_DEBUG_SWITCH -20 -O -X23
 #endif
-
-/* arch-tag: 3bfb5a11-d94e-4372-923b-9f47d0851f42
-   (do not change this comment) */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index ce7b268bbec..3391bb17805 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -81,6 +81,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_REMAP
 #define TEXT_START 0
 #endif
-
-/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
-   (do not change this comment) */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 21ba90ad101..6f8f841a46c 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -104,6 +104,3 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif
 #endif /* 0 */
-
-/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
-   (do not change this comment) */
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 34ea78696c1..0b045794e42 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -116,6 +116,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define ADJUST_EXEC_HEADER   \
   hdr.a_stamp = STAMP13; /* really want the latest stamp, whatever it is */
-
-/* arch-tag: 572bf8d1-7a94-48c6-b188-bf69754e0cd2
-   (do not change this comment) */
diff --git a/src/m/mega68.h b/src/m/mega68.h
index e86a5048680..fccd495e0d8 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -47,6 +47,3 @@ Boston, MA 02111-1307, USA.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* arch-tag: 61e6deb4-a93e-444b-bbd5-9887a83f1bbc
-   (do not change this comment) */
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 5a6250c3c31..bf6e708bd7e 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -101,6 +101,3 @@ NOTE-END  */
 
 /* Avoids a compiler bug */
 /* borrowed from sequent.h */
-
-/* arch-tag: e15d9072-9e1a-44bf-8add-966be535967b
-   (do not change this comment) */
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index b2f8c1005b2..d0935ce6160 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -163,5 +163,3 @@ NOTE-END  */
    (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))                \
     >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
 
-/* arch-tag: a4f5c090-0bd5-48f0-9724-b7d531f9b6c8
-   (do not change this comment) */
diff --git a/src/m/mips.h b/src/m/mips.h
index 5426ec6473d..3948cb6855c 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -217,6 +217,3 @@ NOTE-END  */
 #endif /* BSD_SYSTEM */
 
 #endif /* not NEWSOS5 && not __linux__ */
-
-/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
-   (do not change this comment) */
diff --git a/src/m/mips4.h b/src/m/mips4.h
index 4b79e466fb3..5371fc03200 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -57,6 +57,3 @@ NOTE-END  */
 #undef HAVE_XSCREENRESOURCESTRING
 #undef HAVE_SETSID
 #endif
-
-/* arch-tag: 56050454-0df5-4de9-b1b7-0c6ab400313c
-   (do not change this comment) */
diff --git a/src/m/ncr386.h b/src/m/ncr386.h
index f98566a2959..2599456a873 100644
--- a/src/m/ncr386.h
+++ b/src/m/ncr386.h
@@ -13,6 +13,3 @@
 #define LD_SWITCH_X_DEFAULT -Xlinker LD_SWITCH_X_SITE_AUX
 
 #endif /* __GNUC__ */
-
-/* arch-tag: 79c76283-7d50-499b-b910-8ef980357758
-   (do not change this comment) */
diff --git a/src/m/news-r6.h b/src/m/news-r6.h
index d4a2b8869f2..7018dc9571a 100644
--- a/src/m/news-r6.h
+++ b/src/m/news-r6.h
@@ -53,6 +53,3 @@
   ((a) =                                                                \
    (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))                        \
     >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
-
-/* arch-tag: b9fd7b75-ba3c-46d4-8966-24381b13001b
-   (do not change this comment) */
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index 2ecaff41cb9..cba5bbc5689 100644
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -57,6 +57,3 @@
 #define BROKEN_PROTOTYPES
 
 #endif /* not NEWSOS5 */
-
-/* arch-tag: cf17300c-dd34-4b9d-a657-2de718469662
-   (do not change this comment) */
diff --git a/src/m/news.h b/src/m/news.h
index 1a594ad82a7..812432d8f38 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -60,5 +60,3 @@ NOTE-END  */
 
 #define LIBS_TERMCAP -ltermcap
 
-/* arch-tag: 79bfd831-874a-4339-85fa-b8cbdc29bdab
-   (do not change this comment) */
diff --git a/src/m/next.h b/src/m/next.h
index 1e8a3d3a31c..b2ceb49f434 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -121,6 +121,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* This should be true for recent NeXT systems.  At least since 3.2.  */
 #define HAVE_MACH_MACH_H
-
-/* arch-tag: 1155cdcb-1f6c-4208-a2da-22c7473060a1
-   (do not change this comment) */
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index d6c09bd65b5..4df55957d90 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -103,6 +103,3 @@ Boston, MA 02111-1307, USA.  */
  */
 
 /* #define NO_SOCK_SIGIO */
-
-/* arch-tag: 1529f2bc-50d9-42e7-ae72-6f40afadf09e
-   (do not change this comment) */
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 70804ef2c36..d002405fe13 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -102,6 +102,3 @@ Boston, MA 02111-1307, USA.  */
  */
 
 /* #define NO_SOCK_SIGIO */
-
-/* arch-tag: d9e12769-ae79-4c25-953f-70db5b7ef5dd
-   (do not change this comment) */
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 549f648c7f8..f684c3dcc6d 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -89,6 +89,3 @@ NOTE-END  */
 #define static
 
 #endif /* USG */
-
-/* arch-tag: 4210db3c-e35c-4b96-9399-1dbde3e00a57
-   (do not change this comment) */
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 214954b631a..c3183862355 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -96,6 +96,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define START_FILES pre-crt0.o /lib/crt0.o
 #endif
-
-/* arch-tag: 13dde0e0-8ed5-4bc3-a0dc-5456c9db5f94
-   (do not change this comment) */
diff --git a/src/m/nu.h b/src/m/nu.h
index 44abc929053..8eb9374e6da 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -69,6 +69,3 @@ Boston, MA 02111-1307, USA.  */
    in the executable file.  */
 
 #define SECTION_ALIGNMENT pagemask
-
-/* arch-tag: 7d2d9b6d-75d4-4c0d-96a9-a41f06212f35
-   (do not change this comment) */
diff --git a/src/m/orion.h b/src/m/orion.h
index 76519f6fe68..2a89251e23c 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -64,6 +64,3 @@ Boston, MA 02111-1307, USA.  */
 #define FSCALE 1.0
 #endif
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* arch-tag: 4fcf38ad-d6b0-434b-bc10-16647d5a7fb6
-   (do not change this comment) */
diff --git a/src/m/orion105.h b/src/m/orion105.h
index c58f9222068..7e5fb34b319 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -66,6 +66,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Arguments to ignore before argc in crt0.c.  */
 #define DUMMIES dummy1, dummy2,
-
-/* arch-tag: 32fed6e3-8cae-4882-b327-a68c2af6db7a
-   (do not change this comment) */
diff --git a/src/m/paragon.h b/src/m/paragon.h
index 11b98dea7ee..5c00f7d8d92 100644
--- a/src/m/paragon.h
+++ b/src/m/paragon.h
@@ -8,6 +8,3 @@
 #define KEEP_OLD_TEXT_SCNPTR
 #define KEEP_OLD_PADDR
 #define drem fmod
-
-/* arch-tag: c1bc280c-25e5-4993-9b91-333c52ab3674
-   (do not change this comment) */
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index c6762a93120..c417a1d58ad 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -87,6 +87,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SIOCTL_H
 
 #define BROKEN_SIGIO
-
-/* arch-tag: f3a127d5-790b-4c78-b6be-837139fb12c4
-   (do not change this comment) */
diff --git a/src/m/plexus.h b/src/m/plexus.h
index b7012c750d6..22dbffa16f9 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -103,6 +103,3 @@ Boston, MA 02111-1307, USA.  */
 /* This triggers some stuff to avoid a compiler bug */
 
 #define TAHOE_REGISTER_BUG
-
-/* arch-tag: 78c607eb-b4f8-4750-b575-39670d979448
-   (do not change this comment) */
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 911f84d3c8a..54f246fed65 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -105,6 +105,3 @@ NOTE-END  */
 
 /* Enable a fix in process.c.  */
 #define SET_CHILD_PTY_PGRP
-
-/* arch-tag: 45d5070e-d2b7-479f-b336-3fd497c36e15
-   (do not change this comment) */
diff --git a/src/m/powermac.h b/src/m/powermac.h
index dc698675eaa..0ab535dfd23 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -109,6 +109,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: d8af08a6-48b3-4c8a-94a0-0b4acae5e1f0
-   (do not change this comment) */
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index 4733156337a..2c01acb843d 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -56,6 +56,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Control a conditional in unexelf.c.  */
 #define SOLARIS_POWERPC
-
-/* arch-tag: dc2c3cb6-4683-45ae-961f-0a4f2bda3c61
-   (do not change this comment) */
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 7ba6a9e058e..7abd4f88b3f 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -61,6 +61,3 @@ Boston, MA 02111-1307, USA.  */
 /* Reenable this #define for old versions of the Pyramid system.  */
 
 /* #define PYRAMID_OLD */
-
-/* arch-tag: b9097bc9-92be-46d4-acb1-13c2b966d581
-   (do not change this comment) */
diff --git a/src/m/pyrmips.h b/src/m/pyrmips.h
index 67705fb6619..1489ddaa664 100644
--- a/src/m/pyrmips.h
+++ b/src/m/pyrmips.h
@@ -6,5 +6,3 @@
 #define SYSTEM_MALLOC
 #define CANNOT_DUMP
 
-/* arch-tag: 82559148-25a8-466d-bbb3-f903f7666b7a
-   (do not change this comment) */
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index a72c7055780..2c815ff97bb 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -127,5 +127,3 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo library.  */
 #define LIBS_TERMCAP -ltermlib
 
-/* arch-tag: 0494629b-7e11-4f6f-865f-62254ac46099
-   (do not change this comment) */
diff --git a/src/m/sequent.h b/src/m/sequent.h
index 7e45c4f4fda..404bbf54668 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -163,6 +163,3 @@ NOTE-END */
   sprintf (ptyname, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
 #define PTY_TTY_NAME_SPRINTF \
   sprintf (ptyname, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-
-/* arch-tag: 81caea48-aa64-4021-9544-e969dea71ee8
-   (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8656152fb7a..8e22ccb2b21 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -97,6 +97,3 @@ NOTE-END  */
                                    should be here.  -- fx */
 #endif
 #endif
-
-/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
-   (do not change this comment) */
diff --git a/src/m/sps7.h b/src/m/sps7.h
index ba4eae18510..1589f2cbfb2 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -112,6 +112,3 @@ Boston, MA 02111-1307, USA.  */
 #define ADJUST_EXEC_HEADER f_hdr.f_magic = SMROMAGIC;\
  f_ohdr.stsize = 0;
 #endif
-
-/* arch-tag: 2240f71c-6f3b-4a82-80fc-4d56c682d7ad
-   (do not change this comment) */
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index c3865a79e72..579432aa3b0 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -160,6 +160,3 @@ Boston, MA 02111-1307, USA.  */
 #define rindex strrchr
 
 /* #endif */
-
-/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
-   (do not change this comment) */
diff --git a/src/m/stride.h b/src/m/stride.h
index 941b9d7cc98..4e1fd18dc91 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -115,6 +115,3 @@ Boston, MA 02111-1307, USA.  */
 /* Define this macro if system defines a type `union wait'.  */
 
 #define HAVE_UNION_WAIT
-
-/* arch-tag: 65c635ed-5bc7-4ace-ab20-f3442429c8ba
-   (do not change this comment) */
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 54d51106e6b..6bff1d21677 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -74,6 +74,3 @@ NOTE-END  */
 /* Mask for address bits within a memory segment */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
-
-/* arch-tag: 58ec9c79-48bd-4d1b-aad1-65a09a6b0d10
-   (do not change this comment) */
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 33f811aea04..5107f3c47d2 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -95,6 +95,3 @@ NOTE-END  */
 #define SYMS_MACHINE syms_of_sunfns ()
 #define PURESIZE 132000
 #endif
-
-/* arch-tag: 543c3570-74ca-4099-aa47-db7c7b691c8e
-   (do not change this comment) */
diff --git a/src/m/sun3-68881.h b/src/m/sun3-68881.h
index 33b9c2bd527..1210bef6300 100644
--- a/src/m/sun3-68881.h
+++ b/src/m/sun3-68881.h
@@ -26,6 +26,3 @@ NOTE-END  */
 
 #define sun_68881
 #define START_FILES crt0.o /usr/lib/Mcrt1.o
-
-/* arch-tag: f8659e89-5f5e-4921-940c-814a5786b901
-   (do not change this comment) */
diff --git a/src/m/sun3-fpa.h b/src/m/sun3-fpa.h
index b78adaf7378..1b2c084e010 100644
--- a/src/m/sun3-fpa.h
+++ b/src/m/sun3-fpa.h
@@ -26,6 +26,3 @@ NOTE-END  */
 
 #define sun_fpa
 #define START_FILES crt0.o /usr/lib/Wcrt1.o
-
-/* arch-tag: db287fbb-966f-4a70-a3f4-a6768c09326b
-   (do not change this comment) */
diff --git a/src/m/sun3-soft.h b/src/m/sun3-soft.h
index 32b2558c01b..0913e875d8a 100644
--- a/src/m/sun3-soft.h
+++ b/src/m/sun3-soft.h
@@ -27,6 +27,3 @@ NOTE-END  */
 
 #define sun_soft
 #define START_FILES crt0.o /usr/lib/Fcrt1.o
-
-/* arch-tag: 76e9d7e6-66a8-4c4f-b0a5-335d082e5720
-   (do not change this comment) */
diff --git a/src/m/sun3.h b/src/m/sun3.h
index b2713703416..24f84d8e2da 100644
--- a/src/m/sun3.h
+++ b/src/m/sun3.h
@@ -48,6 +48,3 @@ NOTE-END  */
    For maximum cleanliness, don't edit this file;
    instead, insert this line in config.h.  */
 /* #define START_FILES crt0.o /usr/lib/Mcrt1.o  */
-
-/* arch-tag: d0559a79-2285-4a78-ad68-9694264d0d8a
-   (do not change this comment) */
diff --git a/src/m/sun386.h b/src/m/sun386.h
index d3866e8f177..61468f99879 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -80,6 +80,3 @@ NOTE-END  */
    on the 386 needs this.  */
 #define LIBS_MACHINE -lkvm
 #endif
-
-/* arch-tag: 861af4b4-ce5f-475e-876e-ebff6436a1fe
-   (do not change this comment) */
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index ca584c9c6e1..a3e89c58490 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -89,6 +89,3 @@ Boston, MA 02111-1307, USA.  */
   sprintf (pty_name, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
 #define PTY_TTY_NAME_SPRINTF \
   sprintf (pty_name, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-
-/* arch-tag: 4169a89e-3764-4147-98df-1ba3bdd45a5b
-   (do not change this comment) */
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 084e432223e..4aa142fbd91 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -109,6 +109,3 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_PTYS                       /* we do have PTYs if we have TCP */
 #define HAVE_SOCKETS                    /* we do have sockets if we have TCP */
 #define LIBS_SYSTEM -lsocket            /* get TCP networking functions */
-
-/* arch-tag: e0c09754-b0f2-48da-a8a5-aee3c94838f4
-   (do not change this comment) */
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 42741e25cb6..343247d0529 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -66,6 +66,3 @@ NOTE-END  */
 /* This triggers some stuff to avoid a compiler bug */
 
 #define TAHOE_REGISTER_BUG
-
-/* arch-tag: dd452693-80e1-413f-a164-0141eb68d831
-   (do not change this comment) */
diff --git a/src/m/tandem-s2.h b/src/m/tandem-s2.h
index b22f9bb66af..92e9ebfbb35 100644
--- a/src/m/tandem-s2.h
+++ b/src/m/tandem-s2.h
@@ -19,6 +19,3 @@
 /* Correct some library file names.  */
 #define START_FILES pre-crt0.o /usr/lib/crt1.o1.31
 #define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o1.31
-
-/* arch-tag: ae34a1a6-6408-4b23-a6d3-ce4e8f124916
-   (do not change this comment) */
diff --git a/src/m/targon31.h b/src/m/targon31.h
index afc72f4e0ee..7c44f12e177 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
 #define SEGMENT_MASK 0xffff
 
 #define SWITCH_ENUM_BUG 1
-
-/* arch-tag: f2438018-7d4e-4be5-b368-4bf342b7785b
-   (do not change this comment) */
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 34b160ba6da..d402022a034 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -99,6 +99,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: afa06e53-094c-4a19-9219-155f8ba4bbcc
-   (do not change this comment) */
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index a30bbdd8d6c..2e1fa20d371 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -111,6 +111,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* We need this to get dumping to work */
 #define KEEP_OLD_TEXT_SCNPTR
-
-/* arch-tag: fd3cebc3-2aed-4f8c-be9b-f37331c6e0ff
-   (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index 914daa3047c..6def690cd98 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -109,6 +109,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: d7dae0a9-4f99-4939-bef9-5738e1f33955
-   (do not change this comment) */
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 947e495aa20..307d2b93e33 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -109,6 +109,3 @@ Boston, MA 02111-1307, USA.  */
 #include <asld.h>
 #define EXEC_MAGIC AOUT1MAGIC
 #define EXEC_PAGESIZE DATACLICK
-
-/* arch-tag: a08e7dea-d48e-44cc-b60d-c7f2e5187ff5
-   (do not change this comment) */
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index fbd7e032a38..3d54366aa94 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -107,6 +107,3 @@ Boston, MA 02111-1307, USA.  */
 /* The OS needs stream.h+ptem.h included in sysdep.c.  */
 #define NO_SIOCTL_H
 #define NEED_PTEM_H
-
-/* arch-tag: 3dff1355-7cb6-49e3-8834-85a369e4ea8f
-   (do not change this comment) */
diff --git a/src/m/ustation.h b/src/m/ustation.h
index b03a3555352..17d59df0d02 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -126,6 +126,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define BROKEN_SIGIO
 #define BROKEN_SIGTSTP
-
-/* arch-tag: 797f1d3e-3077-4eee-a81b-03fcf3a988fe
-   (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index 2e9d4738b64..eace9f7e144 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -113,6 +113,3 @@ NOTE-END  */
 #ifdef BSD4_2
 #define HAVE_FTIME
 #endif
-
-/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
-   (do not change this comment) */
diff --git a/src/m/wicat.h b/src/m/wicat.h
index bca10df352d..0a9596cd15c 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -131,6 +131,3 @@ Boston, MA 02111-1307, USA.  */
 #undef TERMINFO
 #define LIBS_TERMCAP select.o -ltermlib
 #endif
-
-/* arch-tag: b181c512-0275-4d25-9bbc-be0c8ca7bcad
-   (do not change this comment) */
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 701e6e21e1b..4188a7032ec 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -119,6 +119,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: ed6dc0c1-5c01-49df-befd-c25dfadfb8cf
-   (do not change this comment) */
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 617b0a9c1d7..26cec523741 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
 #define LIB_STANDARD  -lc
 #define LD_SWITCH_MACHINE -X
 #define SECTION_ALIGNMENT (0x3ff)
-
-/* arch-tag: 42316eb5-74b2-4762-970a-e372c6a2783d
-   (do not change this comment) */
diff --git a/src/mac.c b/src/mac.c
index 9d3af053495..ce2e4242493 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -2988,6 +2988,3 @@ syms_of_mac ()
   defsubr (&Smac_file_name_to_posix);
   defsubr (&Sposix_file_name_to_mac);
 }
-
-/* arch-tag: 29d30c1f-0c6b-4f88-8a6d-0558d7f9dbff
-   (do not change this comment) */
diff --git a/src/macfns.c b/src/macfns.c
index 1634809ca3e..003ae084c2c 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -9026,6 +9026,3 @@ init_xfns ()
 #endif
 #endif /* NTEMACS_TODO */
 }
-
-/* arch-tag: d7591289-f374-4377-b245-12f5dbbb8edc
-   (do not change this comment) */
diff --git a/src/macgui.h b/src/macgui.h
index 34f5913d5df..e04cf448b4a 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -198,5 +198,3 @@ typedef struct {
 
 #endif /* EMACS_MACGUI_H */
 
-/* arch-tag: 5a0da49a-35e2-418b-a58c-8a55778ae849
-   (do not change this comment) */
diff --git a/src/macmenu.c b/src/macmenu.c
index 0a6747896b6..72fb95fbaa9 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2374,6 +2374,3 @@ The enable predicate for a menu command should check this variable.  */);
   defsubr (&Sx_popup_dialog);
 #endif
 }
-
-/* arch-tag: 40b2c6c7-b8a9-4a49-b930-1b2707184cce
-   (do not change this comment) */
diff --git a/src/macros.c b/src/macros.c
index d0219a3be04..1b23f4b3c8c 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -406,6 +406,3 @@ syms_of_macros ()
   DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
                  doc: /* Last kbd macro defined, as a string or vector; nil if none defined.  */);
 }
-
-/* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e
-   (do not change this comment) */
diff --git a/src/macros.h b/src/macros.h
index 41a32efe2e0..3f2629c661d 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -52,6 +52,3 @@ extern void finalize_kbd_macro_chars P_ ((void));
 /* Store a character into kbd macro being defined */
 
 extern void store_kbd_macro_char P_ ((Lisp_Object));
-
-/* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
-   (do not change this comment) */
diff --git a/src/macterm.c b/src/macterm.c
index 8c22d047939..d00c1d690ac 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -8827,6 +8827,3 @@ command, this enables the Mac keyboard to be used to enter non-ASCII
 characters directly.  */);
   mac_keyboard_text_encoding = kTextEncodingMacRoman;
 }
-
-/* arch-tag: f2259165-4454-4c04-a029-a133c8af7b5b
-   (do not change this comment) */
diff --git a/src/macterm.h b/src/macterm.h
index b3fe53c86ea..65925334623 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -581,5 +581,3 @@ void deactivate_scroll_bars (FRAME_PTR);
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
 
-/* arch-tag: 6b4ca125-5bef-476d-8ee8-31ed808b7e79
-   (do not change this comment) */
diff --git a/src/makefile.nt b/src/makefile.nt
index 0cf08f37105..e3d05846ccc 100644
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -1228,5 +1228,3 @@ $(BLD)\w32bdf.obj: \
         $(SRC)\w32.h \
         $(SRC)\frame.h \
         $(SRC)\blockinput.h
-
-# arch-tag: ee9a97ba-19b7-4b50-a127-aaf4efe494dc
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 56bdc641afe..8b4195e0b78 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1445,5 +1445,3 @@ $(BLD)/w32bdf.$(O): \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
         $(SRC)/w32term.h
-
-# arch-tag: 9fd7aba8-f826-4111-b3c0-497a8e7db9a0
diff --git a/src/marker.c b/src/marker.c
index ab054ba2dd9..abdc123c876 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -921,6 +921,3 @@ syms_of_marker ()
                doc: /* Non-nil enables debugging checks in byte/char position conversions.  */);
   byte_debug_flag = 0;
 }
-
-/* arch-tag: 50aa418f-cdd0-4838-b64b-94aa4b2a3b74
-   (do not change this comment) */
diff --git a/src/md5.c b/src/md5.c
index c8df5616fa9..a27d67b04fb 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -441,6 +441,3 @@ md5_process_block (buffer, len, ctx)
   ctx->C = C;
   ctx->D = D;
 }
-
-/* arch-tag: 60084f04-b434-42cb-9d2b-e91df01f4325
-   (do not change this comment) */
diff --git a/src/md5.h b/src/md5.h
index e1cb3dd2e5e..c4788cacabd 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -144,6 +144,3 @@ extern void *md5_buffer __P ((const char *buffer, size_t len,
                                 void *resblock));
 
 #endif /* md5.h */
-
-/* arch-tag: 7cd389f3-6c40-4950-999d-0b2ebd1d20d7
-   (do not change this comment) */
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 578cf59f12e..fb3dae2eb84 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -194,6 +194,3 @@ get_lim_data ()
 #endif /* not WINDOWSNT */
 #endif /* not USG */
 #endif /* not NO_LIM_DATA */
-
-/* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5
-   (do not change this comment) */
diff --git a/src/minibuf.c b/src/minibuf.c
index 542fdd54f1d..d265e8063f1 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2687,6 +2687,3 @@ keys_of_minibuf ()
   initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'),
                       "minibuffer-complete-and-exit");
 }
-
-/* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73
-   (do not change this comment) */
diff --git a/src/mktime.c b/src/mktime.c
index cd8f0254030..fa9c9911edb 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -564,6 +564,3 @@ Local Variables:
 compile-command: "gcc -DDEBUG -DHAVE_LIMITS_H -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
 End:
 */
-
-/* arch-tag: 9456752f-7ddd-47cb-8286-fa807b1355ae
-   (do not change this comment) */
diff --git a/src/msdos.c b/src/msdos.c
index b04b55c2260..5f2f488b20f 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -64,7 +64,6 @@ Boston, MA 02111-1307, USA.  */
 #include "commands.h"
 #include "blockinput.h"
 #include "keyboard.h"
-#include "intervals.h"
 #include <go32.h>
 #include <pc.h>
 #include <ctype.h>
@@ -1436,7 +1435,7 @@ IT_note_mode_line_highlight (struct window *w, int x, int mode_line_p)
       /* Find the glyph under X.  */
       glyph = (row->glyphs[TEXT_AREA]
                + x
-               /* in case someone implements scroll bars some day... */
+               /* Does MS-DOG really support scroll-bars??  ++KFS */
                - WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (w));
       end = glyph + row->used[TEXT_AREA];
       if (glyph < end
@@ -5298,6 +5297,3 @@ nil means don't delete them until `list-processes' is run.  */);
 }
 
 #endif /* MSDOS */
-
-/* arch-tag: db404e92-52a5-475f-9eb2-1cb78dd05f30
-   (do not change this comment) */
diff --git a/src/msdos.h b/src/msdos.h
index a07979d2f6a..40d01a8bba6 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -159,6 +159,3 @@ void XMenuDestroy (Display *, XMenu *);
 #endif /* not HAVE_X_WINDOWS */
 
 #endif /* not EMACS_MSDOS_H */
-
-/* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3
-   (do not change this comment) */
diff --git a/src/ndir.h b/src/ndir.h
index bcf52c902f4..f02dfbd6703 100644
--- a/src/ndir.h
+++ b/src/ndir.h
@@ -53,6 +53,3 @@ extern void		seekdir();
 extern void             closedir();
 
 #define rewinddir( dirp )       seekdir( dirp, 0L )
-
-/* arch-tag: aea50570-ffb7-43fd-b423-7743b10fbe6e
-   (do not change this comment) */
diff --git a/src/param.h b/src/param.h
index 5e80bf9e548..1b27b50a276 100644
--- a/src/param.h
+++ b/src/param.h
@@ -1,5 +1,2 @@
 /* This is so that Emacs can run on VMS... */
 #define EXEC_PAGESIZE 512
-
-/* arch-tag: a6daea28-33a6-4dd3-97d8-5ee1a12f09d3
-   (do not change this comment) */
diff --git a/src/point.h b/src/point.h
index 0156e1baed2..7bae693f2d4 100644
--- a/src/point.h
+++ b/src/point.h
@@ -3,6 +3,3 @@
 static char point_bits[] = {
    0x1f, 0x0e, 0x0e, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x04, 0x04, 0x0e, 0x0e, 0x1f};
-
-/* arch-tag: a8dad510-7254-4964-b71e-bb6f81cce572
-   (do not change this comment) */
diff --git a/src/pre-crt0.c b/src/pre-crt0.c
index 8abc9545417..67fd31cd6ac 100644
--- a/src/pre-crt0.c
+++ b/src/pre-crt0.c
@@ -7,6 +7,3 @@
 /* Create a label to appear at the beginning of data space.  */
 
 int data_start = 0;
-
-/* arch-tag: 2e260272-0790-495f-9362-55abd56b5c5a
-   (do not change this comment) */
diff --git a/src/prefix-args.c b/src/prefix-args.c
index eeeb1038a47..4f5b620a2f3 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -71,6 +71,3 @@ Echo each ARG preceded by PREFIX and a space.\n", progname);
 
   exit (0);
 }
-
-/* arch-tag: 08136d70-e5c0-49c7-bcd8-b4850233977a
-   (do not change this comment) */
diff --git a/src/print.c b/src/print.c
index bbb491dc584..e06b8a0052d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -506,7 +506,7 @@ print_string (string, printcharfun)
         for (i = 0; i < size; i++)
           PRINTCHAR (SREF (string, i));
       else
-        for (i = 0; i < size_byte; )
+        for (i = 0; i < size_byte; i++)
           {
             /* Here, we must convert each multi-byte form to the
                corresponding character code before handing it to PRINTCHAR.  */
@@ -2170,6 +2170,3 @@ that need to be recorded in the table.  */);
 
   defsubr (&Swith_output_to_temp_buffer);
 }
-
-/* arch-tag: bc797170-94ae-41de-86e3-75e20f8f7a39
-   (do not change this comment) */
diff --git a/src/process.c b/src/process.c
index dbb26e43a7b..c4ba96a9e5c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6799,6 +6799,3 @@ syms_of_process ()
 
 
 #endif /* not subprocesses */
-
-/* arch-tag: 3706c011-7b9a-4117-bd4f-59e7f701a4c4
-   (do not change this comment) */
diff --git a/src/process.h b/src/process.h
index 63680a0ed8e..6ad7f7ddf5e 100644
--- a/src/process.h
+++ b/src/process.h
@@ -133,6 +133,3 @@ extern int synch_process_retcode;
 #ifndef NULL_DEVICE
 #define NULL_DEVICE "/dev/null"
 #endif
-
-/* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72
-   (do not change this comment) */
diff --git a/src/puresize.h b/src/puresize.h
index 6ca10b22fdf..67c8aede134 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1100000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (920000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
@@ -96,6 +96,3 @@ extern char my_edata[];
 
 #endif /* PNTR_COMPARISON_TYPE */
 #endif /* VIRT_ADDRESS_VARIES */
-
-/* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f
-   (do not change this comment) */
diff --git a/src/ralloc.c b/src/ralloc.c
index 75c25258a9d..f710cfdc2b7 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1286,6 +1286,3 @@ r_alloc_init ()
 
   use_relocatable_buffers = 1;
 }
-
-/* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
-   (do not change this comment) */
diff --git a/src/regex.c b/src/regex.c
index a31bb490ff2..f55cc5aeb61 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -6327,6 +6327,3 @@ regfree (preg)
 WEAK_ALIAS (__regfree, regfree)
 
 #endif /* not emacs  */
-
-/* arch-tag: 4ffd68ba-2a9e-435b-a21a-018990f9eeb2
-   (do not change this comment) */
diff --git a/src/regex.h b/src/regex.h
index 1818d5f9681..1cfd4363ea7 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -571,6 +571,3 @@ version-control: t
 trim-versions-without-asking: nil
 End:
 */
-
-/* arch-tag: bda6e3ec-3c02-4237-a55a-01ad2e120083
-   (do not change this comment) */
diff --git a/src/region-cache.c b/src/region-cache.c
index fc9d3f98de0..b5b5202653f 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -832,6 +832,3 @@ pp_cache (c)
       fprintf (stderr, "%d : %d\n", pos, BOUNDARY_VALUE (c, i));
     }
 }
-
-/* arch-tag: 98c29f3f-2ca2-4e3a-92f0-f2249200a17d
-   (do not change this comment) */
diff --git a/src/region-cache.h b/src/region-cache.h
index 9c104b51a1b..073d26b6bf3 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -110,6 +110,3 @@ extern int region_cache_backward P_ ((struct buffer *BUF,
                                       struct region_cache *CACHE,
                                       int POS,
                                       int *NEXT));
-
-/* arch-tag: 70f79125-ef22-4f58-9aec-a48ca2791435
-   (do not change this comment) */
diff --git a/src/s/386-ix.h b/src/s/386-ix.h
index 33658dd65e6..dc17281df01 100644
--- a/src/s/386-ix.h
+++ b/src/s/386-ix.h
@@ -13,6 +13,3 @@
 /* This is said to be needed as a result of having _insque rather
    than insque in -loldX.  This may not always be the right thing.  */
 #define WRONG_NAME_INSQUE
-
-/* arch-tag: c2fc2d64-46fd-4a87-933b-85eff622829c
-   (do not change this comment) */
diff --git a/src/s/386bsd.h b/src/s/386bsd.h
index 706fbf23acb..427dc2003de 100644
--- a/src/s/386bsd.h
+++ b/src/s/386bsd.h
@@ -22,6 +22,3 @@
 
 /* This affects a declaration in xrdb.c.  */
 #define DECLARE_GETPWUID_WITH_UID_T
-
-/* arch-tag: 8a114892-0863-4285-a4cb-3d66ba2d8e7b
-   (do not change this comment) */
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index b96bf4373b3..330cbae4279 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -213,5 +213,3 @@ Boston, MA 02111-1307, USA.  */
 /* For unexaix.c. */
 #define ALIGN_DATA_RELOC
 
-/* arch-tag: bfff798c-542d-4290-91f2-267394c85b7b
-   (do not change this comment) */
diff --git a/src/s/aix3-2-5.h b/src/s/aix3-2-5.h
index 6c8458cc8a4..04c8ccf44ad 100644
--- a/src/s/aix3-2-5.h
+++ b/src/s/aix3-2-5.h
@@ -28,6 +28,3 @@
 /* Bill Woodward <wpwood@austin.ibm.com> says:
    libIM *must* precede libXm, to avoid getting aixLoadIM error messages.  */
 #define LIB_MOTIF -lIM -lXm
-
-/* arch-tag: 692b3acb-5383-4cfb-93f6-378b5c48c75e
-   (do not change this comment) */
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index 6dfbe5d751c..b8e5bd6d65b 100644
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -49,6 +49,3 @@
    lose declaring char * rindex without this.
    It is just a guess which versions of AIX need this definition.  */
 #undef HAVE_STRING_H
-
-/* arch-tag: 0935754d-67e1-4697-978a-3e9976da05c3
-   (do not change this comment) */
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index 21d05cb154d..e179684f3b6 100644
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -40,6 +40,3 @@
 /* Unfortunately without libXmu we cannot support EditRes.  */
 #define NO_EDITRES
 #endif
-
-/* arch-tag: 72d598e1-bc3e-48e0-bfd2-693917c3738e
-   (do not change this comment) */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 66b7d322b56..fbc20b24a58 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,3 @@
 #include "aix4-1.h"
 
 #undef ALIGN_DATA_RELOC
-
-/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
-   (do not change this comment) */
diff --git a/src/s/aix4.h b/src/s/aix4.h
index b2ed15f75ea..5e1be65241e 100644
--- a/src/s/aix4.h
+++ b/src/s/aix4.h
@@ -12,6 +12,3 @@
 /* Specify the type that the 3rd arg of `accept' points to.
    It is just a guess which versions of AIX need this definition.  */
 #define SOCKLEN_TYPE int
-
-/* arch-tag: b9471dfc-ccdc-4980-a8a1-80c7627ec6b2
-   (do not change this comment) */
diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index 30833b5ff9a..99280daf832 100644
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -43,6 +43,3 @@
 #endif
 
 #define GETPGRP_NO_ARG 1
-
-/* arch-tag: 867e3bb8-e9df-4763-9c82-8f4accb8209e
-   (do not change this comment) */
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 624f7090f80..fc797755c08 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -127,6 +127,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Special library needed for linking for 4.1.  */
 #define LIBS_SYSTEM -ljobs
-
-/* arch-tag: de56716a-ed9b-4851-a5c5-c882efaf9931
-   (do not change this comment) */
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index e39a8c81948..27ad9a5fe6e 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -118,6 +118,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 38ca640f-549e-4726-a257-71048ab4c480
-   (do not change this comment) */
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index f5db6fbb5cd..46cb3a53528 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -118,5 +118,3 @@ Boston, MA 02111-1307, USA.  */
 
 #define SIGNALS_VIA_CHARACTERS
 
-/* arch-tag: 0c367245-bde3-492e-9029-3ff6898beb95
-   (do not change this comment) */
diff --git a/src/s/bsdos2-1.h b/src/s/bsdos2-1.h
index 244d58f5137..7a8b6630d02 100644
--- a/src/s/bsdos2-1.h
+++ b/src/s/bsdos2-1.h
@@ -4,6 +4,3 @@
 
 #undef LIB_X11_LIB
 #define LIB_X11_LIB -L/usr/X11/lib -lX11 -lipc
-
-/* arch-tag: cf1ada4a-cdbf-452b-a264-ff84dd523e97
-   (do not change this comment) */
diff --git a/src/s/bsdos2.h b/src/s/bsdos2.h
index 9e1e82fd75a..a6970b65491 100644
--- a/src/s/bsdos2.h
+++ b/src/s/bsdos2.h
@@ -9,6 +9,3 @@
 
 #undef  KERNEL_FILE
 #define KERNEL_FILE     "/bsd"
-
-/* arch-tag: 25ce1827-1511-4305-9058-24dd2118b5b4
-   (do not change this comment) */
diff --git a/src/s/bsdos3.h b/src/s/bsdos3.h
index 20a9704e14f..faa5f821e20 100644
--- a/src/s/bsdos3.h
+++ b/src/s/bsdos3.h
@@ -4,6 +4,3 @@
 
 #undef  LIBS_SYSTEM
 #define LIBS_SYSTEM -lkvm
-
-/* arch-tag: 726766f3-5a62-48bf-8e21-3b21ec6abe6f
-   (do not change this comment) */
diff --git a/src/s/bsdos4.h b/src/s/bsdos4.h
index 540e4a7d790..6c3e498deb8 100644
--- a/src/s/bsdos4.h
+++ b/src/s/bsdos4.h
@@ -21,6 +21,3 @@
 #define LIB_GCC
 
 #endif /* not __ELF__ */
-
-/* arch-tag: 7659632a-a879-4153-bb8b-3765a1463ca1
-   (do not change this comment) */
diff --git a/src/s/cxux.h b/src/s/cxux.h
index fd8b00ff2b4..c39f2413cc2 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -230,6 +230,3 @@ Boston, MA 02111-1307, USA.  */
    Note that emacs carefully avoids static vars inside functions.  */
 
 /* #define static */
-
-/* arch-tag: 5febe5fe-f0b0-49cb-9280-9d5a9fa43710
-   (do not change this comment) */
diff --git a/src/s/cxux7.h b/src/s/cxux7.h
index b9ecf45f6bb..83323a98642 100644
--- a/src/s/cxux7.h
+++ b/src/s/cxux7.h
@@ -5,6 +5,3 @@
 #define USING_CX_UX_7
 
 #include "cxux.h"
-
-/* arch-tag: 520cfbad-fd5c-4b3b-ace4-66e9bcd31a60
-   (do not change this comment) */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 033eb636966..d10a7264053 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -144,6 +144,3 @@ Boston, MA 02111-1307, USA.  */
 #define vfork fork
 
 /* the end */
-
-/* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
-   (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 5f2aa0ca309..e9faa6605ce 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -316,6 +316,3 @@ struct kboard;
 #if defined (HAVE_CARBON) && (defined (emacs) || defined (temacs))
 #define select sys_select
 #endif
-
-/* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
-   (do not change this comment) */
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 4c4a84d9996..95dee6b2571 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -349,6 +349,3 @@ extern struct sigaction act, oact;
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 1b6d117d-82d2-4480-a6d0-3f7a8360f658
-   (do not change this comment) */
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 7a1eaf42105..188429c1aee 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -137,6 +137,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define PENDING_OUTPUT_COUNT(FILE) (1)
 
 #endif /* NOT_C_CODE */
-
-/* arch-tag: c7013e7b-6e2e-44f2-ba61-90b6d5e2ea45
-   (do not change this comment) */
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index 3d4c4775c91..8091b9f88cc 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -62,6 +62,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is needed according to Ehud Karni <ehud@unix.simonwiesel.co.il>
    for m88k-dg-dgux5.4R3.10.  */
 #undef BSD_PGRPS
-
-/* arch-tag: c11938c9-0cb0-4652-88aa-7eb80bf1cda9
-   (do not change this comment) */
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index 7121f5e18a3..1eaeccdf269 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -45,6 +45,3 @@ Boston, MA 02111-1307, USA.  */
           caused trouble on DGUX 5.4.2.  */
 #define LIBS_SYSTEM -ldgc
 #endif
-
-/* arch-tag: a14f4043-6caa-4f01-a9b9-ae0fb0d2c96e
-   (do not change this comment) */
diff --git a/src/s/domain.h b/src/s/domain.h
index ebcdc7ea365..dc57f8ff9a3 100644
--- a/src/s/domain.h
+++ b/src/s/domain.h
@@ -2,6 +2,3 @@
 
 /* Inhibit using -X, which is the default.  */
 #define LD_SWITCH_SYSTEM
-
-/* arch-tag: 08941c4f-d0b6-4ad6-b7e3-7e7fe76c0e94
-   (do not change this comment) */
diff --git a/src/s/esix.h b/src/s/esix.h
index 357e7736476..64d0822bf5f 100644
--- a/src/s/esix.h
+++ b/src/s/esix.h
@@ -22,6 +22,3 @@
 #define NO_SIOCTL_H
 #define NEED_PTEM_H
 #define BROKEN_FIONREAD
-
-/* arch-tag: d66e6a70-0812-437d-aa35-9b01bd474941
-   (do not change this comment) */
diff --git a/src/s/esix5r4.h b/src/s/esix5r4.h
index 4240f3d7f4a..d8cf0184f3a 100644
--- a/src/s/esix5r4.h
+++ b/src/s/esix5r4.h
@@ -22,6 +22,3 @@
 /* zircon!joe says this makes X windows work.  */
 # define BROKEN_FIONREAD
 #endif
-
-/* arch-tag: 2d314ae9-0357-4ddf-96e5-cf821071ba4b
-   (do not change this comment) */
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index f3049724d12..94336835f50 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -68,9 +68,6 @@ Boston, MA 02111-1307, USA.  */
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
-#else
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
 #endif
 
 #define SYSV_SYSTEM_DIR
@@ -219,6 +216,3 @@ Boston, MA 02111-1307, USA.  */
    of sigblock says it is obsolete.  */
 
 #define POSIX_SIGNALS           1
-
-/* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
-   (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index efdc2bc00ef..ac0ad0b014d 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -362,6 +362,3 @@ Boston, MA 02111-1307, USA.  */
 #define GC_LISP_OBJECT_ALIGNMENT 2
 #endif
 #endif
-
-/* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
-   (do not change this comment) */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index f7fb4899db9..807ff80378b 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -92,6 +92,3 @@ Boston, MA 02111-1307, USA.  */
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */
-
-/* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
-   (do not change this comment) */
diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 04e0bd4f72c..5175bd10bfe 100644
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -42,5 +42,3 @@
 #undef LDAV_SYMBOL
 #define LDAV_SYMBOL "avenrun"
 
-/* arch-tag: c5422584-cd86-4e10-8089-9f604523dab7
-   (do not change this comment) */
diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h
index 004ddd95043..5175bd10bfe 100644
--- a/src/s/hiuxwe2.h
+++ b/src/s/hiuxwe2.h
@@ -42,5 +42,3 @@
 #undef LDAV_SYMBOL
 #define LDAV_SYMBOL "avenrun"
 
-/* arch-tag: c56449e1-6d1b-4537-a596-0b08b8e4ec73
-   (do not change this comment) */
diff --git a/src/s/hpux.h b/src/s/hpux.h
index debf6aad6d3..9a2e7e845f8 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -221,6 +221,3 @@ Boston, MA 02111-1307, USA.  */
 /* It's possible that HPUX 7 has sys/wait.h but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
 #endif
-
-/* arch-tag: 75c1239f-fedb-4f64-8f86-7893e75699e8
-   (do not change this comment) */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index a15b81a5e90..8e661188d72 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -9,5 +9,3 @@
    don't exist from 10.20 on (see process.c) */
 #undef POLL_INTERRUPTED_SYS_CALL
 
-/* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
-   (do not change this comment) */
diff --git a/src/s/hpux10.h b/src/s/hpux10.h
index 3612cfe0027..ba0a11ff60d 100644
--- a/src/s/hpux10.h
+++ b/src/s/hpux10.h
@@ -60,6 +60,3 @@
    Causes "poll: interrupted system call" messages when Emacs is run
    in an X window (see process.c) */
 #define POLL_INTERRUPTED_SYS_CALL
-
-/* arch-tag: 1b95d569-a3c1-4fb0-8f69-fef264c17c24
-   (do not change this comment) */
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 7bd4afb116b..1d49d6eedca 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -13,6 +13,3 @@
 /* It does work on HPUX to open the pty's tty in the parent (Emacs),
    then close and reopen it in the child.  */
 #define USG_SUBTTY_WORKS
-
-/* arch-tag: f5a3d780-82cd-4a9a-832e-a4031aab788b
-   (do not change this comment) */
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index e73c630e825..a151769fcf9 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -69,6 +69,3 @@
 
 /* Enable a special hack in XTread_socket.  */
 #define X_IO_BUG
-
-/* arch-tag: 25fafe5c-b26c-43ab-8144-1629d59207ee
-   (do not change this comment) */
diff --git a/src/s/hpux9-x11r4.h b/src/s/hpux9-x11r4.h
index 6a701d5a412..7d321162eae 100644
--- a/src/s/hpux9-x11r4.h
+++ b/src/s/hpux9-x11r4.h
@@ -8,5 +8,3 @@
 #undef  LD_SWITCH_X_DEFAULT
 #define LD_SWITCH_X_DEFAULT -L/usr/lib/Motif1.1
 
-/* arch-tag: 47664d7b-23ce-43e6-acdd-044a4be08da3
-   (do not change this comment) */
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index 7562c6ae7ef..d73d3b7ce8d 100644
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -71,5 +71,3 @@
 #undef HAVE_RINT
 
 
-/* arch-tag: 0a5e9f05-012c-4962-a222-a7a3a7fe0ab7
-   (do not change this comment) */
diff --git a/src/s/hpux9shr.h b/src/s/hpux9shr.h
index d273d2e7787..41ef98741c0 100644
--- a/src/s/hpux9shr.h
+++ b/src/s/hpux9shr.h
@@ -11,6 +11,3 @@
 #define C_DEBUG_SWITCH
 #endif
 #endif
-
-/* arch-tag: 1b259627-c5f6-4260-866f-781b06d72f6b
-   (do not change this comment) */
diff --git a/src/s/hpux9shxr4.h b/src/s/hpux9shxr4.h
index 63810273698..7f59f64b777 100644
--- a/src/s/hpux9shxr4.h
+++ b/src/s/hpux9shxr4.h
@@ -6,5 +6,3 @@
 #undef  LD_SWITCH_X_DEFAULT
 #define LD_SWITCH_X_DEFAULT -L/usr/lib/Motif1.1
 
-/* arch-tag: 7f68b8b6-c733-4e6c-81df-39d8d13fb656
-   (do not change this comment) */
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 51391d56e9d..1b8e045ce79 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -160,6 +160,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
-
-/* arch-tag: 41161051-477f-44be-bb2a-0eead3142157
-   (do not change this comment) */
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 50d0962e48f..56e0e06fefc 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -157,6 +157,3 @@ Boston, MA 02111-1307, USA.  */
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
-
-/* arch-tag: cdf2033e-a2d5-43e1-a1a2-a7243cf41a11
-   (do not change this comment) */
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index fad50aa20f8..1d02c5c3270 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -150,6 +150,3 @@ Boston, MA 02111-1307, USA.  */
 /* This was formerly in LIBS_MACHINE in iris4d.h,
    but it is not needed for newer system versions.  */
 #define LIBS_SYSTEM -lsun
-
-/* arch-tag: cccdd761-2ae9-4e71-a33e-749681c01889
-   (do not change this comment) */
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 215cbdc32de..4144c34d9af 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -51,6 +51,3 @@
     return -1;                                                  \
   strcpy (pty_name, name);                                      \
 }
-
-/* arch-tag: cfd7e200-a4dc-4f67-9a32-4184c10b0c57
-   (do not change this comment) */
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index 91017fb56d2..1bdd479eb9f 100644
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -113,6 +113,3 @@ char *_getpty();
 #define NARROWPROTO 1
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
-   (do not change this comment) */
diff --git a/src/s/irix5-2.h b/src/s/irix5-2.h
index b9cca67acdf..a9056fae8c1 100644
--- a/src/s/irix5-2.h
+++ b/src/s/irix5-2.h
@@ -16,6 +16,3 @@
    for jpff@maths.bath.ac.uk.
    Note that irix6-0.h does not include this file, only irix5-0.h.  */
 #define NO_WTMP_FILE
-
-/* arch-tag: e2f820c1-2a3e-4cee-b5f1-6ce8ab21f439
-   (do not change this comment) */
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index e60120d3f6a..ef86c975573 100644
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -35,6 +35,3 @@
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: a775e465-a619-4655-a58f-5982aad0c624
-   (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index c1cc42a8c0e..7e29dc284b1 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -32,6 +32,3 @@
 #undef ospeed
 
 #undef TIOCSIGSEND              /* defined in usg5-4.h */
-
-/* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
-   (do not change this comment) */
diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index 88f216b77d8..f669fc2c141 100644
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -75,6 +75,3 @@
 /* Some versions of ISC are said to define S_IFLNK even tho
    they don't really support symlinks.  */
 #undef S_IFLNK
-
-/* arch-tag: 4de02713-eac5-4360-9d36-fd82c7a3ae44
-   (do not change this comment) */
diff --git a/src/s/isc3-0.h b/src/s/isc3-0.h
index bbd4e8609d1..327f605ff7e 100644
--- a/src/s/isc3-0.h
+++ b/src/s/isc3-0.h
@@ -44,6 +44,3 @@
    It won't be needed for 4.1.  */
 #define EXTRA_INITIALIZE __setostype (0)
 #endif
-
-/* arch-tag: c1aca3f2-813d-4c1c-ad64-ca6c20ec9bfb
-   (do not change this comment) */
diff --git a/src/s/isc4-0.h b/src/s/isc4-0.h
index d180b5d182c..ccd6cb0627f 100644
--- a/src/s/isc4-0.h
+++ b/src/s/isc4-0.h
@@ -28,6 +28,3 @@
       sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL))
 #endif
 #endif /* not POSIX_SIGNALS */
-
-/* arch-tag: 1278f86f-17f2-462d-88c9-85e4b5faa5c3
-   (do not change this comment) */
diff --git a/src/s/isc4-1.h b/src/s/isc4-1.h
index c37537e629c..df549b9fb7b 100644
--- a/src/s/isc4-1.h
+++ b/src/s/isc4-1.h
@@ -30,6 +30,3 @@
 
 /* ISC 4.1 has sys/wait.h but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
-
-/* arch-tag: ec5c77d9-a330-4d93-8117-d2b374531c67
-   (do not change this comment) */
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 017e1892c10..576c4093c51 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -54,6 +54,3 @@ Boston, MA 02111-1307, USA.  */
 /* warning messages */
 #define C_SWITCH_SYSTEM -D__NO_INCLUDE_WARN__
 #define LIBS_SYSTEM -lbsd
-
-/* arch-tag: fbc81ec9-1c45-416b-a368-799ae7c094a1
-   (do not change this comment) */
diff --git a/src/s/mach-bsd4-3.h b/src/s/mach-bsd4-3.h
index e012679c5ff..df4640b3fc5 100644
--- a/src/s/mach-bsd4-3.h
+++ b/src/s/mach-bsd4-3.h
@@ -3,6 +3,3 @@
    you're in deep shit.  */
 
 #include "bsd4-3.h"
-
-/* arch-tag: 7f7f00f6-ae34-413e-9e6a-1d3b3e3d07e8
-   (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 09d31ed2e04..6d38d4fa592 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -492,6 +492,3 @@ extern void _DebPrint (const char *fmt, ...);
 
 
 /* ============================================================ */
-
-/* arch-tag: 5d4a3a1c-40dc-4dea-9c7c-38fed9ae0eae
-   (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index cef2184a37b..9c9205a33ad 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -275,6 +275,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
-   (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 206ff55c854..c48ac6d32fa 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -138,5 +138,3 @@
 
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
-   (do not change this comment) */
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index f4ab0597eee..7c782a40cd4 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -47,6 +47,3 @@ Boston, MA 02111-1307, USA.  */
 #ifndef HAVE_SOCKETS
 #define HAVE_SOCKETS
 #endif
-
-/* arch-tag: 2bb78fcd-fbc4-46dd-a14b-e4a9be957fe0
-   (do not change this comment) */
diff --git a/src/s/newsos6.h b/src/s/newsos6.h
index ca3dbe706d0..d4e67f7e4cf 100644
--- a/src/s/newsos6.h
+++ b/src/s/newsos6.h
@@ -4,6 +4,3 @@
 
 #define NEWSOS6
 #define HAVE_TEXT_START
-
-/* arch-tag: a0db9cb0-43bb-4f9e-85fa-384e30f02d74
-   (do not change this comment) */
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 36549e88bfa..e40cdb56ec7 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -110,6 +110,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Tell emacs.c not to define abort.  */
 #define NO_ABORT
-
-/* arch-tag: 5cd6fed4-a0be-4402-9349-85a80bc01d57
-   (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d3730324ce8..7273f48e20f 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -23,6 +23,3 @@
 #define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
 
 #endif
-
-/* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
-   (do not change this comment) */
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 61ac04c5f1f..e05f429a743 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -72,6 +72,3 @@
       emacs_close (dummy);                              \
     }                                                   \
   while (0)
-
-/* arch-tag: 65eaea67-fcc3-4de7-8574-d46beb82d4ed
-   (do not change this comment) */
diff --git a/src/s/osf5-0.h b/src/s/osf5-0.h
index 4f22f6d641b..eef028a6e3e 100644
--- a/src/s/osf5-0.h
+++ b/src/s/osf5-0.h
@@ -20,6 +20,3 @@
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 89580064-dd8c-4533-a47c-0f92d8090945
-   (do not change this comment) */
diff --git a/src/s/ptx.h b/src/s/ptx.h
index dab0f0f205f..ae76c35f3e6 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -169,6 +169,3 @@ struct timezone
 
 /* Kenneth Stailey <kstailey@eagle.dol-esa.gov> says this is needed.  */
 #define POSIX_SIGNALS
-
-/* arch-tag: 4f5e3abc-643b-413a-bae6-ed212d3af997
-   (do not change this comment) */
diff --git a/src/s/ptx4-2.h b/src/s/ptx4-2.h
index 3940093c28d..cc8e2111cf7 100644
--- a/src/s/ptx4-2.h
+++ b/src/s/ptx4-2.h
@@ -15,6 +15,3 @@
 #ifdef _MALLOC_INTERNAL
 #define _POSIX_SOURCE
 #endif
-
-/* arch-tag: 10a9fab3-9e84-4e9e-9535-6ff42baf9e77
-   (do not change this comment) */
diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index 295cb27d1a3..2505a5dfa03 100644
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -35,6 +35,3 @@
     fatal ("ioctl I_PUSH ldterm", errno);       \
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1 && errno != EINVAL) \
     fatal ("ioctl I_PUSH ttcompat", errno);
-
-/* arch-tag: 14621824-8dca-432b-a97a-049fc4ce0e9f
-   (do not change this comment) */
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 15092f59add..605ed688bcd 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -23,6 +23,3 @@ Boston, MA 02111-1307, USA.  */
 #define  RISCiX         11
 #define  CRT0_O         /lib/crt0.o
 #include "bsd4-3.h"
-
-/* arch-tag: 382df034-9843-4a82-8a3a-2e50a4dd532c
-   (do not change this comment) */
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index 988fbd61ba0..cbc78d58b95 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -23,6 +23,3 @@ Boston, MA 02111-1307, USA.  */
 #define  RISCiX         12
 #define  CRT0_O         /usr/lib/crt0.o
 #include "bsd4-3.h"
-
-/* arch-tag: f6b21e0a-f676-418a-9c8a-10fa8cd9dba7
-   (do not change this comment) */
diff --git a/src/s/riscos5.h b/src/s/riscos5.h
index 6ebf412c1d6..c4b1919bf06 100644
--- a/src/s/riscos5.h
+++ b/src/s/riscos5.h
@@ -9,6 +9,3 @@ extern double atof ();
 #define LD_SWITCH_SYSTEM -non_shared
 
 #define GETPGRP_NO_ARG
-
-/* arch-tag: e8ddf21d-72a0-476d-b33e-364f8b20e3b7
-   (do not change this comment) */
diff --git a/src/s/rtu.h b/src/s/rtu.h
index afe63b5efcc..80dccaafc8d 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -144,6 +144,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 0908970b-1cc0-4d57-b866-61b9bd029a0d
-   (do not change this comment) */
diff --git a/src/s/sco4.h b/src/s/sco4.h
index b39c7a75459..67b96eee59a 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -141,6 +141,3 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SOCKETS_IN_FILE_SYSTEM
 
 #define NARROWPROTO 1
-
-/* arch-tag: 4dd6fe94-bcb7-4be0-942a-ff4bc3cd914e
-   (do not change this comment) */
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 096944b833d..8b091f63b53 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -171,6 +171,3 @@ extern SIGMASKTYPE sigprocmask_set;
 #define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
 
 #define NARROWPROTO 1
-
-/* arch-tag: 930541b5-52d9-4cbe-b73c-f4c72091f5df
-   (do not change this comment) */
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index b45ec57ef1f..a4fc6097905 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -48,6 +48,3 @@
     strncpy (pty_name, ptyname, sizeof (pty_name)); \
     pty_name[sizeof (pty_name) - 1] = 0;        \
   }
-
-/* arch-tag: a8fe2e15-e517-49cb-a863-f346b80885fe
-   (do not change this comment) */
diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h
index 8ac97eaa6df..ad4fb0c5fd6 100644
--- a/src/s/sol2-4.h
+++ b/src/s/sol2-4.h
@@ -33,5 +33,3 @@
    are in this directory on Solaris 2.4.  */
 #define C_SWITCH_X_SYSTEM -I/usr/dt/include
 
-/* arch-tag: 6f0de37b-cfda-427a-a5ae-b83ed54aaae7
-   (do not change this comment) */
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index e02f0b82bc0..600ab999486 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -31,6 +31,3 @@
 /* Probably OK also on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 96d65526-21c9-4547-a797-2bd575c05be7
-   (do not change this comment) */
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index a43443e48c2..94651397658 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -6,6 +6,3 @@
 #undef UNEXEC
 #define UNEXEC unexsol.o
 #endif
-
-/* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
-   (do not change this comment) */
diff --git a/src/s/sol2.h b/src/s/sol2.h
index 5f7d781f3e3..ed82812bc67 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -51,6 +51,3 @@
 #endif
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: b0640f78-5ad5-4093-97c3-5b3abbf5a2be
-   (do not change this comment) */
diff --git a/src/s/sunos4-0.h b/src/s/sunos4-0.h
index d108df68640..0b192f8ae00 100644
--- a/src/s/sunos4-0.h
+++ b/src/s/sunos4-0.h
@@ -47,6 +47,3 @@
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 362f3bfc-810d-4f6e-9b83-5a32f8f1a926
-   (do not change this comment) */
diff --git a/src/s/sunos4-1.h b/src/s/sunos4-1.h
index 2e41c55bbfe..9c6b9cede23 100644
--- a/src/s/sunos4-1.h
+++ b/src/s/sunos4-1.h
@@ -31,6 +31,3 @@
 
 /* Define dlopen, dlclose, dlsym.  */
 #define USE_DL_STUBS
-
-/* arch-tag: 154e2eb2-2180-4d66-90b9-7e56a22004f2
-   (do not change this comment) */
diff --git a/src/s/sunos413.h b/src/s/sunos413.h
index 9f40f2fa3af..5dedb2947f6 100644
--- a/src/s/sunos413.h
+++ b/src/s/sunos413.h
@@ -11,6 +11,3 @@
 #endif
 
 #define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: ebd184b0-9084-4306-8e71-c0437330e1e1
-   (do not change this comment) */
diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index 8427201cda3..d6335326bbb 100644
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -57,6 +57,3 @@
 #endif
 
 #endif  /* not HAVE_X11R6 */
-
-/* arch-tag: cb54321a-ed45-4c17-a23e-1c157758da78
-   (do not change this comment) */
diff --git a/src/s/template.h b/src/s/template.h
index e969c72e0aa..f4d806de146 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -184,6 +184,3 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
-
-/* arch-tag: 4b426b11-cb2e-4c0e-a488-e663f76a0515
-   (do not change this comment) */
diff --git a/src/s/ultrix4-3.h b/src/s/ultrix4-3.h
index 2b4f379d3d1..c8d5e4a324e 100644
--- a/src/s/ultrix4-3.h
+++ b/src/s/ultrix4-3.h
@@ -11,6 +11,3 @@
 /* The address of this is used, but Ultrix header files don't declare it.  */
 extern double rint ();
 #endif
-
-/* arch-tag: 927a396a-d50f-494b-960b-533671184ce1
-   (do not change this comment) */
diff --git a/src/s/umax.h b/src/s/umax.h
index 36f5499a4b3..eaa9b6c4bbc 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -164,6 +164,3 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
-
-/* arch-tag: 2860edda-ce9e-4cfa-943d-3a06c7045854
-   (do not change this comment) */
diff --git a/src/s/umips.h b/src/s/umips.h
index 3d497892c4b..1b573842ea4 100644
--- a/src/s/umips.h
+++ b/src/s/umips.h
@@ -69,6 +69,3 @@
 
 /* High order bit must be stripped off nlist return values */
 #define FIXUP_KERNEL_SYMBOL_ADDR(NL)  (NL)[0].n_value &= 0x7fffffff;
-
-/* arch-tag: 9b816c7d-6ee2-40d9-b6dc-42c0aeccfbec
-   (do not change this comment) */
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0a395b22a09..9e61d3fac7c 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* A system-specific loader switch is needed.  */
 
 #define LD_SWITCH_SYSTEM -N -L/lib/libg /usr/lib/unshared.ld
-
-/* arch-tag: d3f952a9-fef5-45d5-9c1e-c1c32bfef86c
-   (do not change this comment) */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 934821dd166..a4b02531bce 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,6 +1,3 @@
 #include "usg5-4-2.h"
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
-
-/* arch-tag: d82e92e7-9443-4a60-a581-7f293cbae8a3
-   (do not change this comment) */
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index ecce9d92c76..885ad00b1ba 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -151,6 +151,3 @@ Boston, MA 02111-1307, USA.  */
 /* Prevent -lg from being used for debugging.  Not implemented?  */
 
 #define LIBS_DEBUG
-
-/* arch-tag: a18bdba9-506d-40ed-9877-49fc27ce8cac
-   (do not change this comment) */
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index a360fd64d7a..0c8e3c3d2df 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
-
-/* arch-tag: 56923f22-9e2b-4814-b922-88c87657ff6b
-   (do not change this comment) */
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 375dba75f56..e6f586da28d 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -154,6 +154,3 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
-
-/* arch-tag: cfd9500f-0284-4a88-8f07-3f56b42db13b
-   (do not change this comment) */
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index de1a20d2658..5323bb694a6 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -205,6 +205,3 @@ Boston, MA 02111-1307, USA.  */
 /* On USG systems signal handlers return void */
 
 #define SIGTYPE void
-
-/* arch-tag: 2bca65fd-f015-44b9-a2aa-9f8170ce89ca
-   (do not change this comment) */
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index 8b11bc54eae..351d51fe29b 100644
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -54,6 +54,3 @@
 /* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
    is needed in UNIX_SV ... 4.2 1.1.2.  */
 #define LIB_MOTIF -lXm -lXimp
-
-/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
-   (do not change this comment) */
diff --git a/src/s/usg5-4-3.h b/src/s/usg5-4-3.h
index 8d05e8b3fa6..f7773cb0a13 100644
--- a/src/s/usg5-4-3.h
+++ b/src/s/usg5-4-3.h
@@ -6,6 +6,3 @@
    on start up for an i486-ncr-sysv4.3 (running the X toolkit):
   _XipOpenIM() Unable to find Atom _XIM_INPUTMETHOD  */
 #define X11R5_INHIBIT_I18N
-
-/* arch-tag: 03ac8b3a-c3d4-4441-a773-1c1d9f111f1a
-   (do not change this comment) */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 719b8c389a3..49554b9456f 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -193,6 +193,3 @@ Boston, MA 02111-1307, USA.  */
    SINIX.  */
 #undef LIBS_SYSTEM
 #define LIBS_SYSTEM -lgen
-
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
-   (do not change this comment) */
diff --git a/src/s/ux4800.h b/src/s/ux4800.h
index 1c8729f416b..6544bfdebe3 100644
--- a/src/s/ux4800.h
+++ b/src/s/ux4800.h
@@ -15,6 +15,3 @@
 #ifndef __GNUC__
 #define C_DEBUG_SWITCH -O  -KOlimit=3000 -ZXNd=5000
 #endif
-
-/* arch-tag: e42eeb13-028a-490b-8427-0b57010f2ab9
-   (do not change this comment) */
diff --git a/src/s/uxpds.h b/src/s/uxpds.h
index c3ddf1039c1..0b823aaab0d 100644
--- a/src/s/uxpds.h
+++ b/src/s/uxpds.h
@@ -6,6 +6,3 @@
 #define XOS_NEEDS_TIME_H
 
 #define FSCALE 256
-
-/* arch-tag: c02db2a6-c725-4a6b-adee-66e0303df2a8
-   (do not change this comment) */
diff --git a/src/s/uxpv.h b/src/s/uxpv.h
index 95715455984..94ea91eb1a1 100644
--- a/src/s/uxpv.h
+++ b/src/s/uxpv.h
@@ -9,6 +9,3 @@
 
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "uxpv"
-
-/* arch-tag: 3f00cfe7-f44c-45ce-a2fe-2b17fc411a1e
-   (do not change this comment) */
diff --git a/src/s/vms.h b/src/s/vms.h
index dc7877eaa67..9f718099eef 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -246,6 +246,3 @@ globalref char sdata[];
 
 /* What separator do we use in paths?  */
 #define SEPCHAR ','
-
-/* arch-tag: 76bc2b70-46d1-4334-8f12-955c0d0ca6d4
-   (do not change this comment) */
diff --git a/src/s/vms4-0.h b/src/s/vms4-0.h
index c7e0c7be585..3f11a3de30a 100644
--- a/src/s/vms4-0.h
+++ b/src/s/vms4-0.h
@@ -1,5 +1,2 @@
 #include "vms.h"
 #define VMS4_0
-
-/* arch-tag: 734e1c69-d514-4441-bbcd-8b5db8ab1892
-   (do not change this comment) */
diff --git a/src/s/vms4-2.h b/src/s/vms4-2.h
index 01ee788dd66..e632b87e09f 100644
--- a/src/s/vms4-2.h
+++ b/src/s/vms4-2.h
@@ -1,5 +1,3 @@
 #include "vms.h"
 #define VMS4_2
 
-/* arch-tag: d9ff67bc-a899-44b2-a618-a73c821bb559
-   (do not change this comment) */
diff --git a/src/s/vms4-4.h b/src/s/vms4-4.h
index 0abd8259143..c0f60900d53 100644
--- a/src/s/vms4-4.h
+++ b/src/s/vms4-4.h
@@ -1,5 +1,3 @@
 #include "vms.h"
 #define VMS4_4
 
-/* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
-   (do not change this comment) */
diff --git a/src/s/vms5-5.h b/src/s/vms5-5.h
index ac0ba9461a2..e51fedf6317 100644
--- a/src/s/vms5-5.h
+++ b/src/s/vms5-5.h
@@ -6,6 +6,3 @@
    And defining it causes lossage because sys_errlist has a different
    number of elements.  */
 #undef SHARABLE_LIB_BUG
-
-/* arch-tag: 92acc416-61fe-44ae-b0e0-710cb9e38ec6
-   (do not change this comment) */
diff --git a/src/s/windows95.h b/src/s/windows95.h
index cf7f3f13c88..62340c3744e 100644
--- a/src/s/windows95.h
+++ b/src/s/windows95.h
@@ -3,6 +3,3 @@
 #include "windowsnt.h"
 
 #define WINDOWS95
-
-/* arch-tag: 8a37be6f-312c-4b2a-919e-58a71a0fb4b3
-   (do not change this comment) */
diff --git a/src/s/xenix.h b/src/s/xenix.h
index c0840bcd3b3..be742120b60 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -206,6 +206,3 @@ Boston, MA 02111-1307, USA.  */
    are not declared.  */
 
 #define BROKEN_TIOCGETC
-
-/* arch-tag: 71d3985d-4e53-4572-8276-5dce26bbd076
-   (do not change this comment) */
diff --git a/src/scroll.c b/src/scroll.c
index 6c6aa4abf98..d7535509007 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1069,6 +1069,3 @@ do_line_insertion_deletion_costs (frame,
                  FRAME_DELETE_COST (frame), FRAME_DELETEN_COST (frame),
                  coefficient);
 }
-
-/* arch-tag: cdb7149c-48e7-4793-a948-2786c8e45485
-   (do not change this comment) */
diff --git a/src/search.c b/src/search.c
index 538cb8dfa64..89a4a5ad68e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2946,6 +2946,3 @@ syms_of_search ()
   defsubr (&Sset_match_data);
   defsubr (&Sregexp_quote);
 }
-
-/* arch-tag: a6059d79-0552-4f14-a2cb-d379a4e3c78f
-   (do not change this comment) */
diff --git a/src/sound.c b/src/sound.c
index 134b69dc81c..c43cb49d3c4 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1143,6 +1143,3 @@ init_sound ()
 }
 
 #endif /* HAVE_SOUND */
-
-/* arch-tag: dd850ad8-0433-4e2c-9cba-b7aeeccc0dbd
-   (do not change this comment) */
diff --git a/src/strftime.c b/src/strftime.c
index 4d3a9d1d312..4ca6023aa41 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1491,6 +1491,3 @@ emacs_strftimeu (s, maxsize, format, tp, ut)
   return my_strftime (s, maxsize, format, tp, ut, 0);
 }
 #endif
-
-/* arch-tag: 662bc9c4-f8e2-41b6-bf96-b8346d0ce0d8
-   (do not change this comment) */
diff --git a/src/sunfns.c b/src/sunfns.c
index d1c7bcd0c64..8f8bb102765 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -513,6 +513,3 @@ syms_of_sunfns()
   defsubr(&Ssun_get_selection);
   defsubr(&Ssun_menu_internal);
 }
-
-/* arch-tag: 2d7decb7-58f6-41aa-b45b-077ccfab7158
-   (do not change this comment) */
diff --git a/src/syntax.c b/src/syntax.c
index 79df112d265..706706a53a1 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1277,25 +1277,21 @@ scan_words (from, count)
   return from;
 }
 
-DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "p",
+DEFUN ("forward-word", Fforward_word, Sforward_word, 1, 1, "p",
        doc: /* Move point forward ARG words (backward if ARG is negative).
 Normally returns t.
 If an edge of the buffer or a field boundary is reached, point is left there
 and the function returns nil.  Field boundaries are not noticed if
 `inhibit-field-text-motion' is non-nil.  */)
-     (arg)
-     Lisp_Object arg;
+     (count)
+     Lisp_Object count;
 {
   int orig_val, val;
+  CHECK_NUMBER (count);
 
-  if (NILP (arg))
-    XSETFASTINT (arg, 1);
-  else
-    CHECK_NUMBER (arg);
-
-  val = orig_val = scan_words (PT, XINT (arg));
+  val = orig_val = scan_words (PT, XINT (count));
   if (! orig_val)
-    val = XINT (arg) > 0 ? ZV : BEGV;
+    val = XINT (count) > 0 ? ZV : BEGV;
 
   /* Avoid jumping out of an input field.  */
   val = XFASTINT (Fconstrain_to_field (make_number (val), make_number (PT),
@@ -3110,6 +3106,3 @@ See the info node `(elisp)Syntax Properties' for a description of the
   defsubr (&Sbackward_prefix_chars);
   defsubr (&Sparse_partial_sexp);
 }
-
-/* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412
-   (do not change this comment) */
diff --git a/src/syntax.h b/src/syntax.h
index b275ded5715..6d8f201baeb 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -371,6 +371,3 @@ extern int parse_sexp_lookup_properties;
 extern INTERVAL interval_of P_ ((int, Lisp_Object));
 
 extern int scan_words P_ ((int, int));
-
-/* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0
-   (do not change this comment) */
diff --git a/src/sysdep.c b/src/sysdep.c
index 441b36290e1..193f0630cbf 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -5298,5 +5298,3 @@ strsignal (code)
 }
 #endif /* HAVE_STRSIGNAL */
 
-/* arch-tag: edb43589-4e09-4544-b325-978b5b121dcf
-   (do not change this comment) */
diff --git a/src/sysselect.h b/src/sysselect.h
index 5aa9eb4aee7..5a392c381a7 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -43,6 +43,3 @@ Boston, MA 02111-1307, USA.  */
 #if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)
 #define select sys_select
 #endif
-
-/* arch-tag: 36d05500-8cf6-4847-8e78-6721f18c06ef
-   (do not change this comment) */
diff --git a/src/syssignal.h b/src/syssignal.h
index 2b536758e27..2a579f3ba45 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -196,6 +196,3 @@ extern SIGMASKTYPE sigprocmask_set;
 /* strsignal is in sysdep.c */
 char *strsignal ();
 #endif
-
-/* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152
-   (do not change this comment) */
diff --git a/src/systime.h b/src/systime.h
index 778e555c979..d05b5a7de9a 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -172,6 +172,3 @@ extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME));
 #define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0)
 
 #endif /* EMACS_SYSTIME_H */
-
-/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
-   (do not change this comment) */
diff --git a/src/systty.h b/src/systty.h
index a975bcd13a0..39ae61be1c9 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -387,6 +387,3 @@ extern int emacs_set_tty P_ ((int, struct emacs_tty *, int));
 #endif /* not def VMS */
 #endif /* not def HAVE_TERMIO */
 #endif /* not def HAVE_TERMIOS */
-
-/* arch-tag: cf4b90bc-be41-401c-be98-40619178a712
-   (do not change this comment) */
diff --git a/src/syswait.h b/src/syswait.h
index 066f4e5a482..9b0a6899f87 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -152,6 +152,3 @@ Boston, MA 02111-1307, USA.  */
 #endif /* VMS */
 
 #endif /* EMACS_SYSWAIT_H */
-
-/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
-   (do not change this comment) */
diff --git a/src/term.c b/src/term.c
index 1f4ceaec627..829f2d88e6b 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2159,8 +2159,7 @@ term_init (terminal_type)
 {
   char *area;
   char **address = &area;
-  char *buffer = NULL;
-  int buffer_size = 4096;
+  char buffer[2044];
   register char *p;
   int status;
   struct frame *sf = XFRAME (selected_frame);
@@ -2172,6 +2171,9 @@ term_init (terminal_type)
 
   area = (char *) xmalloc (2044);
 
+  if (area == 0)
+    abort ();
+
   FrameRows = FRAME_LINES (sf);
   FrameCols = FRAME_COLS (sf);
   specified_window = FRAME_LINES (sf);
@@ -2200,7 +2202,6 @@ term_init (terminal_type)
 
   Wcm_clear ();
 
-  buffer = (char *) xmalloc (buffer_size);
   status = tgetent (buffer, terminal_type);
   if (status < 0)
     {
@@ -2228,13 +2229,13 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
              terminal_type);
 #endif
     }
-
-#ifndef TERMINFO
-  if (strlen (buffer) >= buffer_size)
+#ifdef TERMINFO
+  area = (char *) xmalloc (2044);
+#else
+  area = (char *) xmalloc (strlen (buffer));
+#endif /* not TERMINFO */
+  if (area == 0)
     abort ();
-  buffer_size = strlen (buffer);
-#endif
-  area = (char *) xmalloc (buffer_size);
 
   TS_ins_line = tgetstr ("al", address);
   TS_ins_multi_lines = tgetstr ("AL", address);
@@ -2559,8 +2560,6 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
   FRAME_CAN_HAVE_SCROLL_BARS (sf) = 0;
   FRAME_VERTICAL_SCROLL_BAR_TYPE (sf) = vertical_scroll_bar_none;
 #endif /* WINDOWSNT */
-
-  xfree (buffer);
 }
 
 /* VARARGS 1 */
@@ -2596,5 +2595,3 @@ The function should accept no arguments.  */);
   defsubr (&Stty_display_color_cells);
 }
 
-/* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193
-   (do not change this comment) */
diff --git a/src/termcap.c b/src/termcap.c
index b1e0a87936e..fa8d0ced0aa 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -828,6 +828,3 @@ tprint (cap)
 }
 
 #endif /* TEST */
-
-/* arch-tag: c2e8d427-2271-4fac-95fe-411857238b80
-   (do not change this comment) */
diff --git a/src/termchar.h b/src/termchar.h
index b1d941adc27..da5413b8f9b 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -44,6 +44,3 @@ extern int dont_calculate_costs; /* Nonzero means don't bother computing
    a suspended Emacs.  This is useful on terminals with multiple pages,
    where one page is used for Emacs and another for all else. */
 extern int no_redraw_on_reenter;
-
-/* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193
-   (do not change this comment) */
diff --git a/src/termhooks.h b/src/termhooks.h
index d76d06671ef..da41266d984 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -430,6 +430,3 @@ enum {
 };
 
 #endif
-
-/* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d
-   (do not change this comment) */
diff --git a/src/terminfo.c b/src/terminfo.c
index 52acc5bdb4e..8b41de4e47e 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -49,6 +49,3 @@ tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8,
   strcpy (outstring, temp);
   return outstring;
 }
-
-/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
-   (do not change this comment) */
diff --git a/src/termopts.h b/src/termopts.h
index 2dc798ea2c4..0fd240bd005 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -39,6 +39,3 @@ extern int meta_key;
 
 /* Nonzero means truncate lines in all windows less wide than the frame */
 extern int truncate_partial_width_windows;
-
-/* arch-tag: 35d4d284-dc1a-4fff-97fa-0154a21aebdb
-   (do not change this comment) */
diff --git a/src/textprop.c b/src/textprop.c
index a243eb6c917..d75e1cf2020 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2295,6 +2295,3 @@ rear-nonsticky properties of the character overrides NONSTICKINESS.  */);
 /*  defsubr (&Serase_text_properties); */
 /*  defsubr (&Scopy_text_properties); */
 }
-
-/* arch-tag: 454cdde8-5f86-4faa-a078-101e3625d479
-   (do not change this comment) */
diff --git a/src/tparam.c b/src/tparam.c
index 7306e0d5c10..fb71e05b3e4 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -334,6 +334,3 @@ main (argc, argv)
 }
 
 #endif /* DEBUG */
-
-/* arch-tag: 83f7b5ac-a808-4f75-b87a-123de009b402
-   (do not change this comment) */
diff --git a/src/uaf.h b/src/uaf.h
index ae364b5f5ef..57615ab4527 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -294,6 +294,3 @@ struct UAF {
 };
 
 #endif /* not UAF$K_LENGTH */
-
-/* arch-tag: f95d73be-b0bf-46b7-adf7-89ce8846b062
-   (do not change this comment) */
diff --git a/src/undo.c b/src/undo.c
index dd086db6c40..fa802fe205a 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -554,6 +554,3 @@ syms_of_undo ()
   defsubr (&Sprimitive_undo);
   defsubr (&Sundo_boundary);
 }
-
-/* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a
-   (do not change this comment) */
diff --git a/src/unexaix.c b/src/unexaix.c
index 825209a5b3c..3c629346bc0 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -676,6 +676,3 @@ unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
     }
   return 0;
 }
-
-/* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0
-   (do not change this comment) */
diff --git a/src/unexalpha.c b/src/unexalpha.c
index ea37817941e..5eada5e0d0f 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -541,6 +541,3 @@ fatal_unexec (s, arg)
   fputs (".\n", stderr);
   exit (1);
 }
-
-/* arch-tag: 46316c49-ee08-4aa3-942b-00798902f5bd
-   (do not change this comment) */
diff --git a/src/unexapollo.c b/src/unexapollo.c
index adf72bb4f7a..4a5ab60b254 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -295,6 +295,3 @@ CopyData (target_file, source_file, total_byte_count)
       total_byte_count -= byte_count;
     }
 }
-
-/* arch-tag: 783ebbdf-7d26-4df8-9469-17a1747dce96
-   (do not change this comment) */
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 10c0dfa953c..a040add1224 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -600,5 +600,3 @@ first_pty_letter ()
   return 'a';
 }
 
-/* arch-tag: 8199e06d-69b5-4f79-84d8-00f6ea929af9
-   (do not change this comment) */
diff --git a/src/unexec.c b/src/unexec.c
index dadea560e0c..aa4170019c7 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -1265,6 +1265,3 @@ adjust_lnnoptrs (writedesc, readdesc, new_name)
 #endif /* COFF */
 
 #endif /* not CANNOT_DUMP */
-
-/* arch-tag: 62409b69-e27a-4a7c-9413-0210d6b54e7f
-   (do not change this comment) */
diff --git a/src/unexelf.c b/src/unexelf.c
index ce773190d7e..d88b8ec37c0 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1284,6 +1284,3 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
 }
-
-/* arch-tag: e02e1512-95e2-4ef0-bba7-b6bce658f1e3
-   (do not change this comment) */
diff --git a/src/unexenix.c b/src/unexenix.c
index a6d045d2e4f..2121c26839f 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -258,6 +258,3 @@ fatal_unexec (s, va_alist)
   fputs (".\n", stderr);
   exit (1);
 }
-
-/* arch-tag: ce26be27-370a-438d-83b4-766059749a02
-   (do not change this comment) */
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
index 146cc5707da..0948ccf9a18 100644
--- a/src/unexhp9k800.c
+++ b/src/unexhp9k800.c
@@ -317,6 +317,3 @@ display_header (hdr, auxhdr)
           hdr->unloadable_sp_location, hdr->unloadable_sp_size);
 }
 #endif /* DEBUG */
-
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
-   (do not change this comment) */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index d3afaf47cc1..c84e5c95d03 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -976,6 +976,3 @@ unexec_free (void *ptr)
   else
     malloc_zone_free (emacs_zone, ptr);
 }
-
-/* arch-tag: 1a784f7b-a184-4c4f-9544-da8619593d72
-   (do not change this comment) */
diff --git a/src/unexmips.c b/src/unexmips.c
index de3368ad181..cad42a17897 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -359,6 +359,3 @@ fatal_unexec (s, va_alist)
   fputs (".\n", stderr);
   exit (1);
 }
-
-/* arch-tag: ebdd2058-3bbc-4de4-b5c7-5760379ab153
-   (do not change this comment) */
diff --git a/src/unexnext.c b/src/unexnext.c
index 50a0448d7bc..649d0e0226f 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -510,6 +510,3 @@ unexec(
                 exit(1);
         }
 }
-
-/* arch-tag: 9796bdc3-c050-417a-b2f5-4cfd31032634
-   (do not change this comment) */
diff --git a/src/unexsni.c b/src/unexsni.c
index a99d51bc0cf..c9abec07e17 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -919,6 +919,3 @@ unexec (new_name, old_name, data_start, bss_start, entry_address)
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod(%s): errno %d\n", new_name, errno);
 }
-
-/* arch-tag: c784ead3-7a27-442b-83fe-7af8d08654d3
-   (do not change this comment) */
diff --git a/src/unexsol.c b/src/unexsol.c
index 426a7f7cb99..382682e4521 100644
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -27,6 +27,3 @@ unexec (char *new_name, char *old_name, unsigned int data_start,
   Fsignal (Qfile_error,
            Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
 }
-
-/* arch-tag: d8ff72b3-8198-4011-8ef5-011b12027f59
-   (do not change this comment) */
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 4534a32c322..6ceab884a99 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -375,6 +375,3 @@ is_it (filename)
     }
   return 0;
 }
-
-/* arch-tag: 30227420-2c6f-4700-a4f8-9e45e52f53b1
-   (do not change this comment) */
diff --git a/src/unexw32.c b/src/unexw32.c
index b1838644965..ece35459d63 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -807,6 +807,3 @@ unexec (char *new_name, char *old_name, void *start_data, void *start_bss,
 }
 
 /* eof */
-
-/* arch-tag: fe1d3d1c-ef88-4917-ab22-f12ab16b3254
-   (do not change this comment) */
diff --git a/src/vlimit.h b/src/vlimit.h
index 5885bee8d2d..c347dc74df6 100644
--- a/src/vlimit.h
+++ b/src/vlimit.h
@@ -1,5 +1,2 @@
 /* Dummy for Emacs so that we can run on VMS... */
 #define LIM_DATA 0
-
-/* arch-tag: 0c3436cb-5edc-447a-87af-acec402a65b9
-   (do not change this comment) */
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 0dc89098afb..c0bab2e48a4 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -145,6 +145,3 @@ memory_warnings (start, warnfun)
   lim_data = 0;
 #endif
 }
-
-/* arch-tag: eab04eda-1f69-447a-8d9f-95f0a3983ca5
-   (do not change this comment) */
diff --git a/src/w16select.c b/src/w16select.c
index 7fb0534f36d..e655936e48b 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -764,6 +764,3 @@ set to nil.  */);
 }
 
 #endif /* MSDOS */
-
-/* arch-tag: 085a22c8-7324-436e-a6da-102464ce95d8
-   (do not change this comment) */
diff --git a/src/w32.c b/src/w32.c
index bc37aebeef8..744cc593133 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3450,22 +3450,11 @@ sys_pipe (int * phandles)
 
   if (rc == 0)
     {
-      /* Protect against overflow, since Windows can open more handles than
-         our fd_info array has room for.  */
-      if (phandles[0] >= MAXDESC || phandles[1] >= MAXDESC)
-        {
-          _close (phandles[0]);
-          _close (phandles[1]);
-          rc = -1;
-        }
-      else
-        {
-          flags = FILE_PIPE | FILE_READ | FILE_BINARY;
-          fd_info[phandles[0]].flags = flags;
+      flags = FILE_PIPE | FILE_READ | FILE_BINARY;
+      fd_info[phandles[0]].flags = flags;
 
-          flags = FILE_PIPE | FILE_WRITE | FILE_BINARY;
-          fd_info[phandles[1]].flags = flags;
-        }
+      flags = FILE_PIPE | FILE_WRITE | FILE_BINARY;
+      fd_info[phandles[1]].flags = flags;
     }
 
   return rc;
@@ -3966,6 +3955,3 @@ void globals_of_w32 ()
 }
 
 /* end of nt.c */
-
-/* arch-tag: 90442dd3-37be-482b-b272-ac752e3049f1
-   (do not change this comment) */
diff --git a/src/w32.h b/src/w32.h
index cce1f094363..845aca26e30 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -134,6 +134,3 @@ extern void globals_of_w32menu ();
 extern void syms_of_fontset ();
 
 #endif /* EMACS_W32_H */
-
-/* arch-tag: 02c36b00-312b-4c4d-a1d9-f905c5e968f0
-   (do not change this comment) */
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 8f7718807a3..73f40a22df6 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -866,6 +866,3 @@ int w32_BDF_to_x_font (char *file, char* xstr, int len)
   CloseHandle (hfilemap);
   return retval;
 }
-
-/* arch-tag: 2e9a45de-0c54-4a0e-95c8-2d67b2b1fa32
-   (do not change this comment) */
diff --git a/src/w32bdf.h b/src/w32bdf.h
index 23939bfd7d8..1786786b90b 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -124,6 +124,3 @@ int w32_BDF_TextOut (bdffont *fontp, HDC hdc, int left,
 int w32_BDF_to_x_font (char *file, char* xstr, int len);
 
 #endif  /* EMACS_W32BDF_H */
-
-/* arch-tag: 7499e9f2-197e-44cc-9274-373f00b51eec
-   (do not change this comment) */
diff --git a/src/w32console.c b/src/w32console.c
index 14885f90730..0ad9c755e25 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -721,6 +721,3 @@ scroll-back buffer.  */);
   defsubr (&Sset_cursor_size);
   defsubr (&Sset_message_beep);
 }
-
-/* arch-tag: a390a07f-f661-42bc-aeb4-e6d8bf860337
-   (do not change this comment) */
diff --git a/src/w32fns.c b/src/w32fns.c
index 53d3418c3e7..e5ec00e8651 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -14451,6 +14451,11 @@ versions of Windows) characters.  */);
   defsubr (&Simage_size);
   defsubr (&Simage_mask_p);
 
+#if GLYPH_DEBUG
+  defsubr (&Simagep);
+  defsubr (&Slookup_image);
+#endif
+
   hourglass_atimer = NULL;
   hourglass_shown_p = 0;
   defsubr (&Sx_show_tip);
@@ -14599,6 +14604,3 @@ w32_last_error()
 {
   return GetLastError ();
 }
-
-/* arch-tag: 707589ab-b9be-4638-8cdd-74629cc9b446
-   (do not change this comment) */
diff --git a/src/w32gui.h b/src/w32gui.h
index 04182c6da80..7aedfbc47ec 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -176,6 +176,3 @@ typedef struct {
 
 
 #endif /* EMACS_W32GUI_H */
-
-/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
-   (do not change this comment) */
diff --git a/src/w32heap.c b/src/w32heap.c
index b40db430ea9..11ec7c1b6c6 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -304,6 +304,3 @@ _heap_term (void)
 }
 
 #endif
-
-/* arch-tag: 9a6a9860-040d-422d-8905-450dd535cd9c
-   (do not change this comment) */
diff --git a/src/w32heap.h b/src/w32heap.h
index 7fdf952683c..6abd658b76d 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -103,6 +103,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_ */
-
-/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
-   (do not change this comment) */
diff --git a/src/w32inevt.c b/src/w32inevt.c
index b3f8e3ff737..f602f8b820b 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -721,6 +721,3 @@ w32_console_read_socket (int sd, struct input_event *bufp, int numchars,
   UNBLOCK_INPUT;
   return ret;
 }
-
-/* arch-tag: 0bcb39b7-d085-4b85-9070-6750e8c03047
-   (do not change this comment) */
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 0b3c70a141e..7df989bffdc 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -30,6 +30,3 @@ extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
                                         unsigned long *time);
 
 #endif /* EMACS_W32INEVT_H */
-
-/* arch-tag: 7641bd54-199f-4552-8e8a-6a2f5340ef13
-   (do not change this comment) */
diff --git a/src/w32menu.c b/src/w32menu.c
index 49ced7fd11c..02bd62eb160 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -2416,6 +2416,3 @@ void globals_of_w32menu ()
   get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");
   set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");
 }
-
-/* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
-   (do not change this comment) */
diff --git a/src/w32proc.c b/src/w32proc.c
index edd286e50d0..7241784925c 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -2238,6 +2238,3 @@ are supported.  Moreover, it slows down `file-attributes' noticeably.  */);
   Vw32_get_true_file_attributes = Qt;
 }
 /* end of ntproc.c */
-
-/* arch-tag: 23d3a34c-06d2-48a1-833b-ac7609aa5250
-   (do not change this comment) */
diff --git a/src/w32reg.c b/src/w32reg.c
index 97abbed5d2e..6d3137f1d4f 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -163,6 +163,3 @@ x_get_string_resource (rdb, name, class)
 
   return (w32_get_string_resource (name, class, REG_SZ));
 }
-
-/* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d
-   (do not change this comment) */
diff --git a/src/w32select.c b/src/w32select.c
index 6533f4b660d..d44ebcbb270 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -489,6 +489,3 @@ set to nil.  */);
 
   QCLIPBOARD = intern ("CLIPBOARD");    staticpro (&QCLIPBOARD);
 }
-
-/* arch-tag: c96e9724-5eb1-4dad-be07-289f092fd2af
-   (do not change this comment) */
diff --git a/src/w32term.c b/src/w32term.c
index 27f221d06ca..539df459402 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -895,17 +895,7 @@ w32_per_char_metric (font, char2b, font_type)
   BOOL retval;
 
   xassert (font && char2b);
-
-  /* TODO: This function is currently called through the RIF, and in
-     some cases font_type is UNKNOWN_FONT. We currently allow the
-     cached metrics to be used, which seems to work, but in cases
-     where font_type is UNKNOWN_FONT, we probably haven't encoded
-     char2b appropriately. All callers need checking to see what they
-     are passing.  This is most likely to affect variable width fonts
-     outside the Latin-1 range, particularly in languages like Thai
-     that rely on rbearing and lbearing to provide composition. I
-     don't think that is working currently anyway, but we don't seem
-     to have anyone testing such languages on Windows.  */
+  xassert (font_type != UNKNOWN_FONT);
 
   /* Handle the common cases quickly.  */
   if (!font->bdf && font->per_char == NULL)
@@ -914,8 +904,6 @@ w32_per_char_metric (font, char2b, font_type)
   else if (!font->bdf && *char2b < 128)
     return &font->per_char[*char2b];
 
-  xassert (font_type != UNKNOWN_FONT);
-
   pcm = &font->scratch;
 
   if (font_type == BDF_1D_FONT)
@@ -4790,7 +4778,7 @@ w32_read_socket (sd, bufp, numchars, expected)
           if (msg.msg.message == msh_mousewheel)
             {
               /* Forward MSH_MOUSEWHEEL as WM_MOUSEWHEEL.  */
-              msg.msg.message = WM_MOUSEWHEEL;
+              msg.msg.message == WM_MOUSEWHEEL;
               prepend_msg (&msg);
             }
           break;
@@ -6559,6 +6547,3 @@ the cursor have no effect.  */);
   staticpro (&last_mouse_motion_frame);
   last_mouse_motion_frame = Qnil;
 }
-
-/* arch-tag: 5fa70624-ab86-499c-8a85-473958ee4646
-   (do not change this comment) */
diff --git a/src/w32term.h b/src/w32term.h
index de28620c7b9..c737632a41f 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -733,6 +733,3 @@ int image_ascent P_ ((struct image *, struct face *));
       ? BDF_1D_FONT : BDF_2D_FONT))
 
 typedef DWORD (WINAPI * ClipboardSequence_Proc) ();
-
-/* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
-   (do not change this comment) */
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 9f9a64558f6..887320aa746 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -409,6 +409,3 @@ x_sync (f)
      void *f;
 {
 }
-
-/* arch-tag: 4fab3695-4ad3-4cc6-a2b1-fd2c67dc46be
-   (do not change this comment) */
diff --git a/src/widget.c b/src/widget.c
index dbf55a34d9c..eaf8e66e9a9 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -1016,6 +1016,3 @@ widget_store_internal_border (widget)
 
   ew->emacs_frame.internal_border_width = f->internal_border_width;
 }
-
-/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9
-   (do not change this comment) */
diff --git a/src/widget.h b/src/widget.h
index c5d4f597ea3..f941d8648b2 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -99,6 +99,3 @@ void EmacsFrameSetCharSize P_ ((Widget, int, int));
 void widget_store_internal_border P_ ((Widget widget));
 
 #endif /* _EmacsFrame_h */
-
-/* arch-tag: 98be17cc-8878-4701-abfa-66f1c04e9cb7
-   (do not change this comment) */
diff --git a/src/widgetprv.h b/src/widgetprv.h
index b75ef769029..d7bec41289c 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -77,6 +77,3 @@ extern EmacsFrameClassRec emacsFrameClassRec;	 /* class pointer */
 
 
 #endif /* _EmacsFrameP_h */
-
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
-   (do not change this comment) */
diff --git a/src/window.c b/src/window.c
index 78033c38da1..b5df84b55ce 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6510,6 +6510,3 @@ keys_of_window ()
   initial_define_key (global_map, Ctl('L'), "recenter");
   initial_define_key (meta_map, 'r', "move-to-window-line");
 }
-
-/* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
-   (do not change this comment) */
diff --git a/src/window.h b/src/window.h
index 0a4bdb6e891..cfb1b349d8b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -892,6 +892,3 @@ extern void keys_of_window P_ ((void));
 extern int window_box_text_cols P_ ((struct window *w));
 
 #endif /* not WINDOW_H_INCLUDED */
-
-/* arch-tag: d4a6942f-e433-4ffe-ac10-2c3574f28577
-   (do not change this comment) */
diff --git a/src/xdisp.c b/src/xdisp.c
index 6a1cba06a52..a61ead4bef2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1999,7 +1999,11 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
      attribute changes of named faces, recompute them.  When running
      in batch mode, the face cache of Vterminal_frame is null.  If
      we happen to get called, make a dummy face cache.  */
-  if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL)
+  if (
+#ifndef WINDOWSNT
+      noninteractive &&
+#endif
+      FRAME_FACE_CACHE (it->f) == NULL)
     init_frame_faces (it->f);
   if (FRAME_FACE_CACHE (it->f)->used == 0)
     recompute_basic_faces (it->f);
@@ -10065,18 +10069,15 @@ redisplay_internal (preserve_echo_area)
             }
         }
 
-      if (!pause)
+      /* Do the mark_window_display_accurate after all windows have
+         been redisplayed because this call resets flags in buffers
+         which are needed for proper redisplay.  */
+      for (i = 0; i < n; ++i)
         {
-          /* Do the mark_window_display_accurate after all windows have
-             been redisplayed because this call resets flags in buffers
-             which are needed for proper redisplay.  */
-          for (i = 0; i < n; ++i)
-            {
-              struct frame *f = updated[i];
-              mark_window_display_accurate (f->root_window, 1);
-              if (frame_up_to_date_hook)
-                frame_up_to_date_hook (f);
-            }
+          struct frame *f = updated[i];
+          mark_window_display_accurate (f->root_window, 1);
+          if (frame_up_to_date_hook)
+            frame_up_to_date_hook (f);
         }
     }
   else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
@@ -18706,11 +18707,6 @@ get_window_cursor_type (w, width, active_cursor)
       return FRAME_BLINK_OFF_CURSOR (f);
     }
 
-#if 0
-  /* Some people liked having a permanently visible blinking cursor,
-     while others had very strong opinions against it.  So it was
-     decided to remove it.  KFS 2003-09-03 */
-
   /* Finally perform built-in cursor blinking:
        filled box      <->   hollow box
        wide [h]bar     <->   narrow [h]bar
@@ -18725,7 +18721,6 @@ get_window_cursor_type (w, width, active_cursor)
       *width = 1;
       return cursor_type;
     }
-#endif
 
   return NO_CURSOR;
 }
@@ -21058,5 +21053,3 @@ init_xdisp ()
 }
 
 
-/* arch-tag: eacc864d-bb6a-4b74-894a-1a4399a1358b
-   (do not change this comment) */
diff --git a/src/xfaces.c b/src/xfaces.c
index 96a1d52b3c2..e296c52a2b8 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6045,18 +6045,6 @@ better_font_p (values, font1, font2, compare_pt_p, avgwidth)
         return 1;
     }
 
-  if (! compare_pt_p)
-    {
-      /* We prefer a real scalable font; i.e. not what autoscaled.  */
-      int auto_scaled_1 = (font1->numeric[XLFD_POINT_SIZE] == 0
-                           && font1->numeric[XLFD_RESY] > 0);
-      int auto_scaled_2 = (font2->numeric[XLFD_POINT_SIZE] == 0
-                           && font2->numeric[XLFD_RESY] > 0);
-
-      if (auto_scaled_1 != auto_scaled_2)
-        return auto_scaled_2;
-    }
-
   return font1->registry_priority < font2->registry_priority;
 }
 
@@ -6289,10 +6277,7 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
                 || better_font_p (specified, fonts + i, best, 0, 0)
                 || (!non_scalable_has_exact_height_p
                     && !better_font_p (specified, best, fonts + i, 0, 0)))
-              {
-                non_scalable_has_exact_height_p = 1;
-                best = fonts + i;
-              }
+              best = fonts + i;
           }
 
       if (needs_overstrike)
@@ -6439,7 +6424,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family)
 
   /* Try any family with the given registry.  */
   if (nfonts == 0)
-    nfonts = try_alternative_families (f, Qnil, registry, fonts);
+    nfonts = font_list (f, Qnil, Qnil, registry, fonts);
 
   return nfonts;
 }
@@ -7742,6 +7727,3 @@ a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point.  */);
   defsubr (&Sx_font_family_list);
 #endif /* HAVE_WINDOW_SYSTEM */
 }
-
-/* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749
-   (do not change this comment) */
diff --git a/src/xfns.c b/src/xfns.c
index 82be739b9d9..af7ed7473e8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -125,14 +125,6 @@ static Lisp_Object Vmotif_version_string;
 
 #endif /* USE_X_TOOLKIT */
 
-#ifdef USE_GTK
-
-/* GTK+ version info */
-
-static Lisp_Object Vgtk_version_string;
-
-#endif /* USE_GTK */
-
 #ifdef HAVE_X11R4
 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
 #else
@@ -3534,19 +3526,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
         ;
     }
 
-  /* Set the WM leader property.  GTK does this itself, so this is not
-     needed when using GTK.  */
-  if (dpyinfo->client_leader_window != 0)
-    {
-      BLOCK_INPUT;
-      XChangeProperty (FRAME_X_DISPLAY (f),
-                       FRAME_OUTER_WINDOW (f),
-                       dpyinfo->Xatom_wm_client_leader,
-                       XA_WINDOW, 32, PropModeReplace,
-                       (char *) &dpyinfo->client_leader_window, 1);
-      UNBLOCK_INPUT;
-    }
-
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window
@@ -6755,37 +6734,7 @@ lookup_rgb_color (f, r, g, b)
   unsigned hash = CT_HASH_RGB (r, g, b);
   int i = hash % CT_SIZE;
   struct ct_color *p;
-  struct x_display_info *dpyinfo;
-
-  /* Handle TrueColor visuals specially, which improves performance by
-     two orders of magnitude.  Freeing colors on TrueColor visuals is
-     a nop, and pixel colors specify RGB values directly.  See also
-     the Xlib spec, chapter 3.1.  */
-  dpyinfo = FRAME_X_DISPLAY_INFO (f);
-  if (dpyinfo->red_bits > 0)
-    {
-      unsigned long pr, pg, pb;
 
-      /* Apply gamma-correction like normal color allocation does.  */
-      if (f->gamma)
-        {
-          XColor color;
-          color.red = r, color.green = g, color.blue = b;
-          gamma_correct (f, &color);
-          r = color.red, g = color.green, b = color.blue;
-        }
-
-      /* Scale down RGB values to the visual's bits per RGB, and shift
-         them to the right position in the pixel color.  Note that the
-         original RGB values are 16-bit values, as usual in X.  */
-      pr = (r >> (16 - dpyinfo->red_bits))   << dpyinfo->red_offset;
-      pg = (g >> (16 - dpyinfo->green_bits)) << dpyinfo->green_offset;
-      pb = (b >> (16 - dpyinfo->blue_bits))  << dpyinfo->blue_offset;
-
-      /* Assemble the pixel color.  */
-      return pr | pg | pb;
-    }
-  
   for (p = ct_table[i]; p; p = p->next)
     if (p->r == r && p->g == g && p->b == b)
       break;
@@ -10937,19 +10886,6 @@ meaning don't clear the cache.  */);
 #endif /* USE_MOTIF */
 #endif /* USE_X_TOOLKIT */
 
-#ifdef USE_GTK
-  Fprovide (intern ("gtk"), Qnil);
-
-  DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
-               doc: /* Version info for GTK+.  */);
-  {
-    char gtk_version[40];
-    g_snprintf (gtk_version, sizeof (gtk_version), "%u.%u.%u",
-                GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-    Vgtk_version_string = build_string (gtk_version);
-  }
-#endif /* USE_GTK */
-
   /* X window properties.  */
   defsubr (&Sx_change_window_property);
   defsubr (&Sx_delete_window_property);
@@ -11104,6 +11040,3 @@ init_xfns ()
 }
 
 #endif /* HAVE_X_WINDOWS */
-
-/* arch-tag: 55040d02-5485-4d58-8b22-95a7a05f3288
-   (do not change this comment) */
diff --git a/src/xmenu.c b/src/xmenu.c
index 00a796b5312..01f4c56acf1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -3376,6 +3376,3 @@ The enable predicate for a menu command should check this variable.  */);
   defsubr (&Sx_popup_dialog);
 #endif
 }
-
-/* arch-tag: 92ea573c-398e-496e-ac73-2436f7d63242
-   (do not change this comment) */
diff --git a/src/xrdb.c b/src/xrdb.c
index ed701c64c63..87c8f4b285d 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -812,6 +812,3 @@ main (argc, argv)
   XCloseDisplay (display);
 }
 #endif /* TESTRM */
-
-/* arch-tag: 37e6fbab-ed05-4363-9e76-6c4109ed511f
-   (do not change this comment) */
diff --git a/src/xselect.c b/src/xselect.c
index 8eda4b78464..21b7ecff8ab 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2400,6 +2400,3 @@ A value of 0 means wait as long as necessary.  This is initialized from the
   Qforeign_selection = intern ("foreign-selection");
   staticpro (&Qforeign_selection);
 }
-
-/* arch-tag: 7c293b0f-9918-4f69-8ac7-03e142307236
-   (do not change this comment) */
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 091d21327ac..5e712fa1b38 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -24,9 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_X_SM
 
 #include <X11/SM/SMlib.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
@@ -50,7 +47,6 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "termhooks.h"
 #include "termopts.h"
-#include "xterm.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
@@ -407,37 +403,9 @@ ice_conn_watch_CB (iceConn, clientData, opening, watchData)
 #endif /* ! defined (SIGIO) */
 }
 
-/* Create the client leader window.  */
-static void
-create_client_leader_window (dpyinfo, client_id)
-     struct x_display_info *dpyinfo;
-     char *client_id;
-{
-  Window w;
-  XClassHint class_hints;
-  Atom sm_id;
-
-  w = XCreateSimpleWindow (dpyinfo->display,
-                           dpyinfo->root_window,
-                           -1, -1, 1, 1,
-                           CopyFromParent, CopyFromParent, CopyFromParent);
-
-  class_hints.res_name = (char *) SDATA (Vx_resource_name);
-  class_hints.res_class = (char *) SDATA (Vx_resource_class);
-  XSetClassHint (dpyinfo->display, w, &class_hints);
-  XStoreName (dpyinfo->display, w, class_hints.res_name);
-
-  sm_id = XInternAtom (dpyinfo->display, "SM_CLIENT_ID", False);
-  XChangeProperty (dpyinfo->display, w, sm_id, XA_STRING, 8, PropModeReplace,
-                   client_id, strlen (client_id));
-
-  dpyinfo->client_leader_window = w;
-}
-
 /* Try to open a connection to the session manager. */
 void
-x_session_initialize (dpyinfo)
-     struct x_display_info *dpyinfo;
+x_session_initialize ()
 {
 #define SM_ERRORSTRING_LEN 512
   char errorstring[SM_ERRORSTRING_LEN];
@@ -498,17 +466,7 @@ x_session_initialize (dpyinfo)
                                 errorstring);
 
   if (smc_conn != 0)
-    {
-      Vx_session_id = make_string (client_id, strlen (client_id));
-
-#ifdef USE_GTK
-      /* GTK creats a leader window by itself, but we need to tell
-         it about our client_id.  */
-      gdk_set_sm_client_id (client_id);
-#else
-      create_client_leader_window (dpyinfo, client_id);
-#endif
-    }
+    Vx_session_id = make_string (client_id, strlen (client_id));
 }
 
 
@@ -586,6 +544,3 @@ See also `emacs-save-session-functions', `emacs-session-save' and
 }
 
 #endif /* HAVE_X_SM */
-
-/* arch-tag: 56a2c58c-adfa-430a-b772-130abd29fd2e
-   (do not change this comment) */
diff --git a/src/xterm.c b/src/xterm.c
index 3874f3db82f..5463ce8e192 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10120,34 +10120,6 @@ same_x_server (name1, name2)
 }
 #endif
 
-/* Count number of set bits in mask and number of bits to shift to
-   get to the first bit.  With MASK 0x7e0, *BITS is set to 6, and *OFFSET
-   to 5.  */
-static void
-get_bits_and_offset (mask, bits, offset)
-     unsigned long mask;
-     int *bits;
-     int *offset;
-{
-  int nr = 0;
-  int off = 0;
-
-  while (!(mask & 1))
-    {
-      off++;
-      mask >>= 1;
-    }
-
-  while (mask & 1)
-    {
-      nr++;
-      mask >>= 1;
-    }
-
-  *offset = off;
-  *bits = nr;
-}
-
 struct x_display_info *
 x_term_init (display_name, xrm_option, resource_name)
      Lisp_Object display_name;
@@ -10164,7 +10136,7 @@ x_term_init (display_name, xrm_option, resource_name)
   if (!x_initialized)
     {
       x_initialize ();
-      ++x_initialized;
+      x_initialized = 1;
     }
 
 #ifdef USE_GTK
@@ -10180,6 +10152,8 @@ x_term_init (display_name, xrm_option, resource_name)
     if (x_initialized > 1)
       return 0;
 
+    x_initialized++;
+
     for (argc = 0; argc < NUM_ARGV; ++argc)
       argv[argc] = 0;
 
@@ -10220,7 +10194,7 @@ x_term_init (display_name, xrm_option, resource_name)
       s = make_string (file, strlen (file));
       abs_file = Fexpand_file_name(s, Qnil);
 
-      if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file)))
+      if (! NILP (abs_file) && Ffile_readable_p (abs_file))
         gtk_rc_parse (SDATA (abs_file));
 
       UNGCPRO;
@@ -10369,7 +10343,6 @@ x_term_init (display_name, xrm_option, resource_name)
   dpyinfo->height = HeightOfScreen (dpyinfo->screen);
   dpyinfo->width = WidthOfScreen (dpyinfo->screen);
   dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen);
-  dpyinfo->client_leader_window = 0;
   dpyinfo->grabbed = 0;
   dpyinfo->reference_count = 0;
   dpyinfo->icon_bitmap_id = -1;
@@ -10395,20 +10368,6 @@ x_term_init (display_name, xrm_option, resource_name)
   dpyinfo->x_highlight_frame = 0;
   dpyinfo->image_cache = make_image_cache ();
 
-  /* See if we can construct pixel values from RGB values.  */
-  dpyinfo->red_bits = dpyinfo->blue_bits = dpyinfo->green_bits = 0;
-  dpyinfo->red_offset = dpyinfo->blue_offset = dpyinfo->green_offset = 0;
-
-  if (dpyinfo->visual->class == TrueColor)
-    {
-      get_bits_and_offset (dpyinfo->visual->red_mask,
-                           &dpyinfo->red_bits, &dpyinfo->red_offset);
-      get_bits_and_offset (dpyinfo->visual->blue_mask,
-                           &dpyinfo->blue_bits, &dpyinfo->blue_offset);
-      get_bits_and_offset (dpyinfo->visual->green_mask,
-                           &dpyinfo->green_bits, &dpyinfo->green_offset);
-    }
-      
   /* See if a private colormap is requested.  */
   if (dpyinfo->visual == DefaultVisualOfScreen (dpyinfo->screen))
     {
@@ -10453,8 +10412,6 @@ x_term_init (display_name, xrm_option, resource_name)
     = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False);
   dpyinfo->Xatom_wm_window_moved
     = XInternAtom (dpyinfo->display, "WM_MOVED", False);
-  dpyinfo->Xatom_wm_client_leader
-    = XInternAtom (dpyinfo->display, "WM_CLIENT_LEADER", False);
   dpyinfo->Xatom_editres
     = XInternAtom (dpyinfo->display, "Editres", False);
   dpyinfo->Xatom_CLIPBOARD
@@ -10609,12 +10566,6 @@ x_term_init (display_name, xrm_option, resource_name)
 #endif
   }
 
-#ifdef HAVE_X_SM
-  /* Only do this for the first display.  */
-  if (x_initialized == 1)
-    x_session_initialize (dpyinfo);
-#endif
-
   UNBLOCK_INPUT;
 
   return dpyinfo;
@@ -10828,6 +10779,10 @@ x_initialize ()
 #endif /* SIGWINCH */
 
   signal (SIGPIPE, x_connection_signal);
+
+#ifdef HAVE_X_SM
+  x_session_initialize ();
+#endif
 }
 
 
@@ -10930,6 +10885,3 @@ default is nil, which is the same as `super'.  */);
 }
 
 #endif /* HAVE_X_WINDOWS */
-
-/* arch-tag: 6d4e4cb7-abc1-4302-9585-d84dcfb09d0f
-   (do not change this comment) */
diff --git a/src/xterm.h b/src/xterm.h
index 4cc8cd34957..fd1e79b9082 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -183,9 +183,6 @@ struct x_display_info
   /* The root window of this screen.  */
   Window root_window;
 
-  /* Client leader window.  */
-  Window client_leader_window;
-
   /* The cursor to use for vertical scroll bars.  */
   Cursor vertical_scroll_bar_cursor;
 
@@ -292,7 +289,6 @@ struct x_display_info
   /* Other WM communication */
   Atom Xatom_wm_configure_denied; /* When our config request is denied */
   Atom Xatom_wm_window_moved;     /* When the WM moves us.  */
-  Atom Xatom_wm_client_leader;    /* Id of client leader window.  */
 
   /* EditRes protocol */
   Atom Xatom_editres;
@@ -360,11 +356,6 @@ struct x_display_info
      use this directly, call x_color_cells instead.  */
   XColor *color_cells;
   int ncolor_cells;
-
-  /* Bits and shifts to use to compose pixel values on Direct and TrueColor
-     visuals.  */
-  int red_bits, blue_bits, green_bits;
-  int red_offset, blue_offset, green_offset;
 };
 
 #ifdef HAVE_X_I18N
@@ -1038,7 +1029,7 @@ extern void widget_store_internal_border P_ ((Widget));
 
 /* Defined in xsmfns.c */
 #ifdef HAVE_X_SM
-extern void x_session_initialize P_ ((struct x_display_info *dpyinfo));
+extern void x_session_initialize P_ ((void));
 extern int x_session_check_input P_ ((struct input_event *bufp,
                                       int *numchars));
 extern int x_session_have_connection P_ ((void));
@@ -1062,6 +1053,3 @@ extern int x_session_have_connection P_ ((void));
    (nr).y = (ry),                                       \
    (nr).width = (rwidth),                               \
    (nr).height = (rheight))
-
-/* arch-tag: 78a7972a-b18f-4694-861a-0780c4b3090e
-   (do not change this comment) */