Fix all my attributions to be correct and consistent...

...in case people are trying to track me down for questions.

.mailmap, ChangeLog.1, admin/notes/copyright, doc/emacs/ChangeLog.1,
doc/emacs/ack.texi, doc/lispref/ChangeLog.1, doc/misc/gnus.texi,
etc/ChangeLog.1, lib-src/ChangeLog.1, lisp/ChangeLog.13,
lisp/ChangeLog.14, lisp/ChangeLog.15, lisp/ChangeLog.17,
lisp/ChangeLog.3, lisp/ChangeLog.4, lisp/ChangeLog.5,
lisp/ChangeLog.6, lisp/ChangeLog.7, lisp/emacs-lisp/lisp-mnt.el,
lisp/finder.el, lisp/loadhist.el, lisp/play/cookie1.el,
lisp/progmodes/asm-mode.el, lisp/progmodes/gud.el,
lisp/progmodes/make-mode.el, lisp/term/AT386.el, src/ChangeLog.3

27 files changed, 212 insertions, 212 deletions

diff --git a/.mailmap b/.mailmap
index 0531cc0c290..f14f086b2e5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -60,7 +60,7 @@ Era Eriksson <era+emacs@iki.fi> <era+emacsbugs@iki.fi>
 Eric Ludlam <zappo@gnu.org>
 Eric Ludlam <zappo@gnu.org> <eric@siege-engine.com>
 Eric Ludlam <zappo@gnu.org> <ericludlam@gmail.com>
-Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
+Eric S. Raymond <esr@thyrsus.com>
 Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
diff --git a/ChangeLog.1 b/ChangeLog.1
index fcfae7c3883..654cb43d4dc 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -7582,7 +7582,7 @@
 
 	* INSTALL.CVS: Clarify why `make bootstrap' sometimes fails.
 
-2008-06-08  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-06-08  Eric S. Raymond  <esr@thyrsus.com>
 
 	* INSTALL.CVS: Indicate when "cvs update -d" may be needed.
 
@@ -9672,7 +9672,7 @@
 	* configure.in: New entry for HP/UX-11.
 
 	* Makefile.in (SOURCES): Replace GETTING.GNU.SOFTWARE with FTP.
-	From Eric S. Raymond <esr@golux.thyrsus.com>.
+	From Eric S. Raymond <esr@thyrsus.com>.
 
 2001-10-28  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -13896,7 +13896,7 @@
 	places.  Implement them by setting C_SWITCH_X_SITE and
 	LD_SWITCH_X_SITE in src/config.h.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* make-dist: Don't distribute etc/Old files.
 
@@ -13907,7 +13907,7 @@
 
 	* make-dist: Fix typo.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* make-dist: Corrected typo, fixed it to discard = and TAGS files
 	in some cases where it should but didn't seen to.
@@ -13924,11 +13924,11 @@
 	* configure: Recognize rs6000-ibm-aix32 and rs6000-ibm-aix, and
 	make rs6000-ibm-aix default to -aix32.
 
-1993-03-17  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Makefile.in: Added `Developer's configuration' section.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Makefile.in: Add commented-out variable settings for developer's
 	configuration.
@@ -14299,7 +14299,7 @@
 	return handler, make a copy of it, not a symbolic link to it; that
 	way, it will work on systems that don't have symbolic links.
 
-1992-08-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-08-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* make-dist: Taught it about vcdiff and rcs2log, added --newer
 	option for generating incremental distributions.  Stopped it from
diff --git a/admin/notes/copyright b/admin/notes/copyright
index ae09707bac8..a06d92a2c5f 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -381,7 +381,7 @@ conclude it was written by me."
 
 lisp/term/README
   - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was
-  written by Eric Raymond. When asked by rms on 14 Feb 2007 he said:
+  written by Eric S. Raymond. When asked by rms on 14 Feb 2007 he said:
 
     I don't remember writing it, but it reads like my prose and I believe
     I wrote the feature(s) it's describing.  So I would have been the
diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1
index 16afa073169..1cf26aeff06 100644
--- a/doc/emacs/ChangeLog.1
+++ b/doc/emacs/ChangeLog.1
@@ -81,7 +81,7 @@
 	* misc.texi (Network Security): Mention the new protocol-level
 	`high' NSM checks.
 
-2014-12-08  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-08  Eric S. Raymond  <esr@thyrsus.com>
 
 	* maintaining.texi: Support for Arch has been moved to obsolete,
 	remove references that imply otherwise.
@@ -128,7 +128,7 @@
 
 	* maintaining.texi (Version Control Systems): Fix a typo.
 
-2014-11-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-11-20  Eric S. Raymond  <esr@thyrsus.com>
 
 	* maintaining.texi: Document SRC support.
 
@@ -5616,11 +5616,11 @@
 	* custom.texi (Variables): Add Directory Variables to menu.
 	(Directory Variables): New node.
 
-2008-05-16  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-16  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc2-xtra.texi: Modify an example so it reflects what vc.el now does.
 
-2008-05-15  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-15  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc2-xtra.texi, emacs.texi, files.texi: Snapshots node renamed to
 	Revision Tags and rewritten.  Section now uses modern terminology,
@@ -5632,7 +5632,7 @@
 	* msdog.texi (Windows Files): Update documentation of
 	w32-get-true-file-attributes.
 
-2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi, vc-xtra.texi, vc1-xtra.texi: Document the new VC
 	directory mode.
@@ -5642,11 +5642,11 @@
 	* killing.texi (Appending Kills): Remove a strangely off-topic index
 	entry "television".
 
-2008-05-07  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-07  Eric S. Raymond  <esr@thyrsus.com>
 
 	* ack.texi, files.texi, vc2-xtra.texi: Meta-CVS is no longer supported.
 
-2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* buffers.texi, files.texi (Version-control):
 	vc-toggle-read-only is no longer a good idea...
@@ -5923,7 +5923,7 @@
 	* mini.texi (Minibuffer History): Add text about a list of minibuffer
 	default values.
 
-2007-10-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-20  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi: Disambiguate two slightly different uses of the term
 	'filesets'.
@@ -5963,7 +5963,7 @@
 
 	* calendar.texi (Diary): Clarify text about diary file example.
 
-2007-10-13  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-13  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi: Capitalize node names according to convention.
 
@@ -5971,13 +5971,13 @@
 
 	* misc.texi (Interactive Shell): Correct INSIDE_EMACS reference.
 
-2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-11  Eric S. Raymond  <esr@thyrsus.com>
 
 	* emacs.texi:
 	* files.texi (Version Systems): Minor fixes to version-control material
 	suggested by RMS and Robert J. Chassell.
 
-2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi (Version Systems):
 	* vc-xtra.texi:
@@ -5987,7 +5987,7 @@
 	Revise text for adequate description of VCSes with monotonic IDs.
 	* emacs.texi: Change of terminology from `version' to `revision'.
 
-2007-10-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi (Version Systems): Describe newer VCses.
 	Reorder the descriptions to be chronological.
@@ -6015,7 +6015,7 @@
 	* basic.texi (Arguments): Replace fill-paragraph with
 	fill-paragraph-or-region.
 
-2007-10-06  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-06  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi: Update the section on version control for 2007
 	conditions.  None of these changes are new-VC-specific; that
@@ -6128,7 +6128,7 @@
 
 	* files.texi (Why Version Control?): Improve previous change.
 
-2007-07-18  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-07-18  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.texi (Why Version Control?): New node.
 
@@ -10860,7 +10860,7 @@
 	* emacs.texi: Add a sentence to the top menu mentioning the
 	specific version of Emacs this manual applies to.
 
-1993-04-25  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* basic.texi: Document next-line-add-lines variable used to
 	implement down-arrow.
@@ -10871,17 +10871,17 @@
 
 	* text.texi: Update unix TeX ordering information.
 
-1993-03-26  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* news.texi: Mention fill-rectangle in keybinding list.
 
 	* killing.texi: Document fill-rectangle.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.texi: Bring the docs up to date with VC 5.2.
 
-1992-01-10  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-01-10  Eric S. Raymond  (esr@thyrsus.com)
 
 	* emacs.tex: Mention blackbox and gomoku under Amusements.
 	Assembler mode is now mentioned and appropriately indexed
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index d61809fa58f..4a8a2a24377 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -899,7 +899,7 @@ Takahashi Naoto co-wrote @file{quail.el} (q.v.), and wrote
 @file{robin.el}, another input method.
 
 @item
-Thomas Neumann and Eric Raymond wrote @file{make-mode.el},
+Thomas Neumann and Eric S. Raymond wrote @file{make-mode.el},
 a mode for editing makefiles.
 
 @item
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index dd6a220398f..c96ba40dbe5 100644
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -7394,7 +7394,7 @@
 	* tips.texi (Coding Conventions): Do not encourage the use of "-flag"
 	variable names.
 
-2008-05-03  Eric S. Raymond  <esr@golux>
+2008-05-03  Eric S. Raymond  <esr@thyrsus.com>
 
 	* keymaps.texi: Clarify that (current-local-map) and
 	(current-global-map) return references, not copies.
@@ -13889,17 +13889,17 @@
 
 	* Makefile (dist): Change to use Gzip instead of compress.
 
-1993-04-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* loading.texi (Unloading): define-function changed back to
 	defalias.  It may not stay this way, but at least it's
 	consistent with the known-good version of the code patch.
 
-1993-03-26  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* modes.texi (Hooks): Document new optional arg of add-hook.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* variables.texi: Document nil initial value of buffer-local variables.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 8d25e868c8a..f017b011d71 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -25476,7 +25476,7 @@ There is no specific spam or ham processor for regular expressions.
 
 @defvar spam-use-bogofilter
 
-Set this variable if you want @code{spam-split} to use Eric Raymond's
+Set this variable if you want @code{spam-split} to use Eric S. Raymond's
 speedy Bogofilter.
 
 With a minimum of care for associating the @samp{$} mark for spam
@@ -25508,7 +25508,7 @@ Get the Bogofilter spamicity score (@code{spam-bogofilter-score}).
 
 @defvar spam-use-bogofilter-headers
 
-Set this variable if you want @code{spam-split} to use Eric Raymond's
+Set this variable if you want @code{spam-split} to use Eric S. Raymond's
 speedy Bogofilter, looking only at the message headers.  It works
 similarly to @code{spam-use-bogofilter}, but the @code{X-Bogosity} header
 must be in the message already.  Normally you would do this with a
diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1
index de6abff2881..68c15fc6e69 100644
--- a/etc/ChangeLog.1
+++ b/etc/ChangeLog.1
@@ -2624,7 +2624,7 @@
 	* images/custom/right.xpm:
 	* images/custom/right-pushed.xpm: New files.
 
-2008-05-07  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-07  Eric S. Raymond  <esr@thyrsus.com>
 
 	* NEWS: Support for Meta-CVS removed.
 
@@ -3015,7 +3015,7 @@
 
 	* NEWS: Mention desktop locking.
 
-2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* NEWS: Explain the VC fileset changes a bit better.
 
@@ -6019,7 +6019,7 @@
 	* Rename termcap to termcap.src, the historical name for an
 	uninstalled termcap file.
 
-1995-06-28  Eric S. Raymond  <esr@spiff.gnu.ai.mit.edu>
+1995-06-28  Eric S. Raymond  <esr@thyrsus.com>
 
 	* termcap.dat, termcap.ucb: Deleted and replaced.
 
@@ -6147,11 +6147,11 @@
 
 	* MACHINES: Add section for NeXT, from Thorsten Ohl.
 
-1993-04-28  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-28  Eric S. Raymond  (esr@thyrsus.com)
 
 	* NEWS: Documented picture-mode improvements.
 
-1993-04-25  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* NEWS: Described the new properties of arrow keys and
 	next-line-add-newlines.  Fixed up the GUD description, it was
@@ -6160,23 +6160,23 @@
 
 	* news.texi: invocation-name now exists.
 
-1993-03-27  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* MORE.STUFF: Added.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* NEWS: Preserved jimb's last change (documenting kill on
 	read-only buffers).
 
 	Added documentation on new info features.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* spook.lines: Alpha-sorted this, and added some new hot buttons
 	for the 1990s.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* MACHINES: Deleted some VMS caveats.  If the src and lisp
 	ChangeLogs are correct, dired and mail and process control are now
@@ -6188,13 +6188,13 @@
 
 	* NEWS: Changed.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* sex.6: Added 900-line support.
 
 	* NEWS: Added news about the package finder.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* MACHINES: `Last updated 10 Feb 1992.' was obviously wrong, so
 	I nuked it.  Let the file mod date serve.  Merged in APOLLO and
@@ -6205,7 +6205,7 @@
 
 	* Makefile (relock, unlock): New productions.
 
-1993-03-18  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-18  Eric S. Raymond  (esr@thyrsus.com)
 
 	Augean-stable cleaning time.  Partly to save space, but mostly to
 	reduce the dizzying amount of *stuff* confronting someone exploring
@@ -6245,7 +6245,7 @@
 	names as per convention.  Originals of all files merged still
 	exist with =-names.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* XENIX: Nuked (moved to =XENIX).  The hackery it describes is
 	no longer necessary in the presence of 19's function-key-map
@@ -6254,7 +6254,7 @@
 1993-03-10  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
 
 	* MACHINES: Update description of SYSVr3 and r4 support, due to
-	Eric Raymond's changes.
+	Eric S. Raymond's changes.
 
 1993-03-09  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
 
@@ -6272,7 +6272,7 @@
 
 	* NEWS: Document included tags tables.
 
-1992-07-22  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Corrected the news about VC to reflect reality.
 
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 84f566262c4..136e8917d50 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -8281,7 +8281,7 @@
 	* etags.c (C_entries): Save the definedef status even when a
 	newline is met inside a string.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Makefile.in (EXECUTABLES): Add rcs-checkin.
 
@@ -8482,7 +8482,7 @@
 
 1992-08-07  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-	* timer.c: Installed new version from Eric Raymond; this is more
+	* timer.c: Installed new version from Eric S. Raymond; this is more
 	portable, since it doesn't try to use SIGIO.
 
 1992-07-17  Jim Blandy  (jimb@wookumz.gnu.ai.mit.edu)
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 820110e2fba..49ff87f464c 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -4251,7 +4251,7 @@
 	* doc-view.el (doc-view-mode): Support tramp, compressed files and
 	files inside archives uniformly.
 
-2008-01-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-01-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* textmodes/sgml-mode.el (sgml-tag-syntax-table): Initialize this
 	constant with a computation on sgml-specials rather than a literal
@@ -4656,7 +4656,7 @@
 	(vc-git-dir-state): Use it instead of processing the status
 	results here.
 
-2008-01-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-01-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* progmodes/grep.el (grep-find-ignored-directories):
 	Initialize from the value of vc-directory-exclusion-list.
@@ -4718,7 +4718,7 @@
 	MS-Windows and MS-DOS.
 	(ispell-grep-options): Use "-Ei" on MS-Windows and MS-DOS.
 
-2008-01-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-01-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-svn.el (vc-svn-modify-change comment): New function.
 
@@ -4727,7 +4727,7 @@
 	* vc-git.el (vc-git-dir-state): Set the vc-backend property.
 	Do not disable undo, with-temp-buffer does it by default.
 
-2008-01-01  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-01-01  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-svn.el (vc-svn-parse-status): Set the `unregistered' property
 	correctly.
@@ -4802,7 +4802,7 @@
 
 	* vc-hg.el (vc-hg-dir-state): Set the vc-backend property.
 
-2007-12-29  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-12-29  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-svn.el (vc-svn-parse-status): Recognize 'unregistered,
 	'added, 'removed.
@@ -4943,7 +4943,7 @@
 
 	* menu-bar.el (menu-bar-describe-menu): Remove dots from menu text.
 
-2007-12-28  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-12-28  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
 	to vc-hooks.el so it will be available to other modes, such as
@@ -4997,7 +4997,7 @@
 	* calc/calccomp.el (math-to-percentsigns): Change placeholder
 	for percent signs.
 
-2007-12-27  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-12-27  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-dired-ignorable-p, vc-dired-hook): Speed optimization;
 	use completion-ignored-extensions to detect files that should be
@@ -5015,7 +5015,7 @@
 	(ps-print-preprint-region): Use `ps-mark-active-p' instead of
 	`region-active-p' for error checking.
 
-2007-12-27  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-12-27  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el, vc-sccs.el, vc-rcs.el, vc-cvs.el, vc-mcvs.el:
 	Put new machinery in place to support editing of change comments
@@ -5029,7 +5029,7 @@
 	* international/mule-cmds.el (select-safe-coding-system):
 	When a buffer is modified, cancel the writing.
 
-2007-12-26  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-12-26  Eric S. Raymond  <esr@thyrsus.com>
 
 	* log-view.el: Add Subversion and Mercurial log format samples.
 
@@ -9147,7 +9147,7 @@
 	don't try other `or' branches regardless of the value returned by
 	fill-region; just return t.
 
-2007-10-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-20  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-do-command): Condition out a misleading message when
 	running asynchronously.
@@ -9197,7 +9197,7 @@
 
 	* vc-hg.el: Require log-view at compile time.
 
-2007-10-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-20  Eric S. Raymond  <esr@thyrsus.com>
 
 	* log-view.el (log-view-diff): Adapt log-view-diff for new VC API.
 
@@ -9812,7 +9812,7 @@
 	* bs.el (bs--mark-unmark): New function.
 	(bs-mark-current, bs-unmark-current): Use it.
 
-2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-11  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-diff):
 	(vc-diff-internal): Merge a patch by Juanma Barranquero.  Also,
@@ -9830,7 +9830,7 @@
 	Use `follow-call-process-filter' rather than `process-filter'.
 	Simplify.
 
-2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-11  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-hooks.el (vc-registered): Robustify this function a bit
 	against filenames with no directory component.
@@ -9919,7 +9919,7 @@
 	* help-fns.el (describe-variable): Add missing "  " for multiline
 	obsolescence info and missing EOL after global value.
 
-2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* add-log.el:
 	* ediff-vers.el:
@@ -9950,7 +9950,7 @@
 	mode" in docstrings and messages.
 	(follow-menu-filter): Fix arg passed to `bound-and-true-p'.
 
-2007-10-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-next-action): Rewrite completely; this principal
 	entry point now operates on a current fileset selected either
@@ -10329,7 +10329,7 @@
 	(smerge-refine-subst): New function holding most of smerge-refine.
 	(smerge-refine): Use it.
 
-2007-10-08  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-08  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-default-wash-log): Remove unused code, the
 	log washers all live in the backends now.
@@ -10390,7 +10390,7 @@
 	* net/tramp-fish.el (tramp-fish-handle-process-file):
 	Rewrite temporary file handling.
 
-2007-10-06  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-10-06  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el: Workfile version -> focus version change.  Port various
 	comments from new VC to reduce the noise in the diff.
@@ -12758,7 +12758,7 @@
 2007-08-20  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* vc-rcs.el (vc-rcs-annotate-command):
-	Fix bug introduced 2007-07-18T16:32:40Z!esr@snark.thyrsus.com:
+	Fix bug introduced 2007-07-18T16:32:40Z!esr@thyrsus.com:
 	Add back :vc-annotate-prefix propertization.
 
 2007-08-20  Andreas Schwab  <schwab@suse.de>
@@ -14226,7 +14226,7 @@
 	* vc-hooks.el (vc-find-root): Walk up the tree to find an existing
 	`file' from which to start the search.
 
-2007-07-19  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-07-19  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-cvs.el (vc-cvs-checkin, vc-cvs-diff): Finish transition from
 	having a single file argument to having a list of files as the
@@ -14245,7 +14245,7 @@
 
 	* uniquify.el: Docstring fixes.
 
-2007-07-18  Eric S. Raymond  <esr@snark.thyrsus.com>
+2007-07-18  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (revision-granularity, create-repo): Document new vc
 	backend properties.
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 09bc4f6c4eb..129621791c0 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -12125,7 +12125,7 @@
 	* vc-dispatcher.el (top-level): Revert previous change: require cl
 	when compiling.
 
-2008-05-16  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-16  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-default-status-printer)
 	(vc-default-prettify-state-info): Enhance the state prettyprinter
@@ -12143,7 +12143,7 @@
 	* net/tramp.el (tramp-handle-write-region): Fix check for short track.
 	Reported by Glenn Morris <rgm@gnu.org>.
 
-2008-05-16  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-16  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el: Remove my analysis of SCCS/RCS concurrency issues from
 	the end of the file, it was good work at one time but has been
@@ -12179,7 +12179,7 @@
 	(ses-mode): Set indent-tabs-mode to nil.
 	(ses-center): Use string-width rather than length.
 
-2008-05-15  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-15  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-cvs.el, vc-git.el, vc-hg.el, vc-hooks.el, vc-mcvs.el,
 	* vc-rcs.el, vc-sccs.el, vc-svn.el, vc.el:
@@ -12204,7 +12204,7 @@
 	* progmodes/cc-mode.el (declare-function): Add compat definition.
 	(awk-mode-syntax-table, c-awk-unstick-NL-prop): Declare for compiler.
 
-2008-05-14  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-14  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-dispatcher.el (vc-dispatcher-selection): Change the returned
 	list to a cons so the caller can get back both expanded and
@@ -12251,7 +12251,7 @@
 	(tramp-echo-mark-marker): New defconst.
 	(tramp-check-for-regexp): Use it.
 
-2008-05-14  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-14  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-deduce-fileset): Do the right thing when visiting a
 	buffer (say, a log buffer or diff buffer) with a vc-dir buffer
@@ -12343,7 +12343,7 @@
 	(dired-toggle-marks, dired-change-marks, dired-unmark-all-files):
 	buffer-read-only -> inhibit-read-only.
 
-2008-05-12  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-12  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-expand-dirs): Stop this function from tossing out
 	explicitly specified files.
@@ -12395,7 +12395,7 @@
 	* emulation/cua-base.el: Put isearch-scroll property
 	on cua-scroll-up and cua-scroll-down.
 
-2008-05-11  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-11  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-hooks.el (vc-recompute-state): Remove (dead code).
 
@@ -12416,7 +12416,7 @@
 
 	* smerge-mode.el (smerge-command-prefix): Fix custom type.
 
-2008-05-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-dispatcher.el (vc-dir-next-directory, vc-dir-prev-directory):
 	New functions implementing motion to next and previous directory.
@@ -12449,7 +12449,7 @@
 
 	* vc-hooks.el (vc-prefix-map): Remove duplicate binding.
 
-2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-dir):
 	* vc-hooks.el: Tweak the VC directory bindings.  These are now
@@ -12466,7 +12466,7 @@
 
 	* simple.el (start-file-process): Clarify docstring.
 
-2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-sccs.el, vc-svn.el, vc-git.el, vc-hg.el, vc-mtn.el:
 	Remove stub implementations of, and references to, wash-log.
@@ -12515,7 +12515,7 @@
 	* vc.el (vc-version-diff, vc-print-log, vc-revert, vc-rollback)
 	(vc-update): Remove unused let bindings.
 
-2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-deduce-fileset, vc-next-action, vc-version-diff)
 	(vc-diff, vc-revert, vc-rollback, vc-update):
@@ -12609,7 +12609,7 @@
 	(robin-current-package-name): Doc fix.
 	(robin-activate): Don't use `iff' in docstring.
 
-2008-05-07  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-07  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el, vc-dispatcher.el: VC-Dired support removed.
 	The code uses a ewoc-based implementation now.
@@ -12639,7 +12639,7 @@
 	* progmodes/fortran.el (fortran-mode): Fix font-lock-syntactic-keywords
 	oddness.
 
-2008-05-06  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-06  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-hooks.el (vc-find-file-hook):
 	* vc-dispatcher.el (vc-resynch-window): Decouple vc-dispatcher
@@ -12692,7 +12692,7 @@
 
 	* dired.el (dired-read-dir-and-switches): Fix up last change.
 
-2008-05-05  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-05  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-deduce-fileset): Lift all the policy and UI stuff
 	out of this function, move it to vc-dispatcher-selection-set.
@@ -12770,7 +12770,7 @@
 	* ls-lisp.el (ls-lisp-insert-directory): Use `string-width'
 	instead of `length' for comparing length of user and group names.
 
-2008-05-03  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-03  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-dispatcher.el: New file, separates out the UI and command
 	execution machinery from VCS-specific logic left in vc.el.
@@ -12789,7 +12789,7 @@
 	* progmodes/grep.el (grep-mode-map): Bind "g" to recompile (like
 	in dired &c).
 
-2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-arch.el, vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el,
 	* vc-hooks.el, vc-mcvs.el, vc-mtn.el, vc-rcs.el, vc-sccs.el,
@@ -12846,7 +12846,7 @@
 	function that is no longer there.
 	(hilit-chg-set): Remove running of highlight-changes-enable-hook.
 
-2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-default-dired-state-info): Change name of primitive
 	to prettify-state-info, in preparation for ripping out dired mode.
@@ -12879,7 +12879,7 @@
 	* progmodes/compile.el (compilation-auto-jump):
 	Set window point to `pos' explicitly.
 
-2008-05-01  Eric S. Raymond  <esr@snark.thyrsus.com>
+2008-05-01  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-bzr.el (vc-bzr-state): Allow this to return 'ignored
 	when appropriate.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index af3203444ae..6bd61211d47 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -11888,7 +11888,7 @@
 	(log-edit-mode, log-edit-extra-flags, log-edit-mode):
 	New declarations.
 
-2010-04-09  Eric Raymond  <esr@snark.thyrsus.com>
+2010-04-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc-hooks.el, vc-git.el: Improve documentation comments.
 
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 5036eabf0fd..3377da7c54d 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -4218,7 +4218,7 @@
 	(package-activate-1): Reload files given by `package--list-loaded-files'.
 	Fix bug#10125, bug#18443, and bug#18448.
 
-2014-12-13  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-13  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-svn.el (vc-svn-diff): Fix bug #19312.
 
@@ -4253,7 +4253,7 @@
 	* files.el (directory-files-recursively): Don't follow symlinks to
 	other directories.
 
-2014-12-12  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-12  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-dav.el, vc/vc-git.el, vc/vc-hg.el, vc/vc-src.el:
 	* vc/vc.el: latest-on-branch-p is no longer a public method.
@@ -4276,7 +4276,7 @@
 
 	* emacs-lisp/let-alist.el: Add new package and macro.
 
-2014-12-10  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-10  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-dispatcher.el, vc/vc-hooks.el, vc/vc-rcs.el:
 	* vc/vc-sccs.el, vc/vc.el: Righteous featurectomy of vc-keep-workfiles,
@@ -4308,7 +4308,7 @@
 	(ruby-toggle-string-quotes): New command that allows you to quickly
 	toggle between single-quoted and double-quoted string literals.
 
-2014-12-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument
 	list, avoids problems witt names containing hyphens.
@@ -4429,7 +4429,7 @@
 	* vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files
 	when FILES is non-nil (bug#19304).
 
-2014-12-08  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-08  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-arch.el: Move to obsolete directory so a test framework
 	won't trip over bit-rot in it.  There has been no Arch snapshot
@@ -4593,7 +4593,7 @@
 	more extensions when generating includes (programs)
 	(bug#19254).
 
-2014-12-03  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-03  Eric S. Raymond  <esr@thyrsus.com>
 
 	* files.el (file-tree-walk): Fix docstring.
 
@@ -4636,7 +4636,7 @@
 
 	* whitespace.el (whitespace-big-indent-regexp): Add :version.
 
-2014-12-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-02  Eric S. Raymond  <esr@thyrsus.com>
 
 	* subr.el (filter): New macro.  Because it's just silly for a Lisp
 	not to have this in 2014.  And VC needs it.
@@ -4659,7 +4659,7 @@
 	is no longer a public method.  It is now local to the one place
 	it's used, in the RCS steal-lock method.
 
-2014-12-01  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-01  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc.el: In all backends: API simplification; could-register
 	is no longer a public method.  (vc-cvs.el still has a private
@@ -4772,7 +4772,7 @@
 	* net/eww.el (eww): Leave point in a place that doesn't cause
 	scrolling when displaying "Loading...".
 
-2014-12-01  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-01  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge'
 	backend method of RCS/CVS/SVN is now 'merge-file', to contrast with
@@ -4791,7 +4791,7 @@
 
 	* emacs-lisp/inline.el: New file.
 
-2014-12-01  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-12-01  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc.el, vc-hooks.el: All backends: API simplification;
 	vc-state-heuristic is no longer a public method, having been
@@ -5226,7 +5226,7 @@
 
 	* vc/vc.el: Fix a typo in the commentary.
 
-2014-11-20  Eric S. Raymond  <esr@snark.thyrsus.com>
+2014-11-20  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-src.el, vc/vc.el: Added support for SRC.  Needs more
 	testing and a real log-view mode.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 5c4d1e7a82a..29585129a8a 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -990,7 +990,7 @@
 	(compilation-minor-mode): New function to toggle
 	compilation-minor-mode; if setting it, call compilation-setup.
 
-1993-04-28  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-28  Eric S. Raymond  (esr@thyrsus.com)
 
 	* bibtex.el: Installed Aaron Larson's new bibtex.el.  See the
 	header comment for details.
@@ -1004,7 +1004,7 @@
 
 	* files.el (file-truename): Undo last change.
 
-1993-04-27  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* files.el (file-truename): Do the right thing when $HOME = "".
 
@@ -1058,7 +1058,7 @@
 	(find-tag-noselect): If NEXT-P is '-, pop location off
 	tags-location-stack.
 
-1993-04-26  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* cmacexp.el: Installed Francesco Potortì's enhanced and
 	cleaned-up version, see its commentary for details.
@@ -1070,13 +1070,13 @@
 	Defvars added for many variables.
 	(te-stty-string): Specify the characters explicitly--not `stty dec'.
 
-1993-04-26  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* files.el (cd): Handle leading "~" like an absolute filename.
 
 	* dired.el: Changed fsets to defaliases.
 
-1993-04-25  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* comint.el (comint-mod): Nuked.  A call to ring-mod replaces it.
 	(comint-mem): Nuked.  A call to member replaces it.
@@ -1099,7 +1099,7 @@
 	(vc-finish-logentry, vc-next-comment, vc-previous-comment):
 	Replace *VC-comment-buffer* with a ring vector.
 
-1993-04-25  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* simple.el (down-arrow): New function.
 	Uses next-line-add-newlines to suppress addition of new lines at end of
@@ -1138,11 +1138,11 @@
 	* shell.el (shell-prompt-pattern): Add `;' as potential prompt
 	delimiter (for `es' and `rc' shells most particularly).
 
-1993-04-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* isearch.el: Replaced all fsets with defaliases.
 
-1993-04-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* bytecomp.el (define-function): Change name back to defaliases
 	to get things in a known-good state.  The unload patch had been
@@ -1190,7 +1190,7 @@
 	* ange-ftp.el (ange-ftp-binary-file-name-regexp):
 	Match .z and .z-part-?? files.
 
-1993-04-21  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-21  Eric S. Raymond  (esr@thyrsus.com)
 
 	* makefile.el: Rewritten and simplified, commentary added.  It now
 	will usually detect when the makefile target or macro lists need
@@ -1223,7 +1223,7 @@
 	* sendmail.el (mail-do-fcc): Make a numeric time zone indicator
 	with current-time-zone--don't run `date'.
 
-1993-04-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* bytecomp.el (byte-compile, byte-compile-keep-pending)
 	(byte-compile-file-form-defmumble): Generate define-function
@@ -1237,7 +1237,7 @@
 	* diff.el (diff-parse-differences): Small robustification ---
 	don't lose if we call this with compilation-parsing-end nil
 
-1993-04-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* electric.el (shrink-window-if-larger-than-buffer):
 	Move to window.el.
@@ -1286,14 +1286,14 @@
 
 	* isearch.el: Doc fixes.
 
-1993-04-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* gud.el (gud-mode): Created C-c synonym bindings in the GUD
 	buffer's local map.
 
 	(gud-key-prefix): Change to C-x C-a.
 
-1993-04-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* help-macro.el: Name changed from help-screen.el to fit in a
 	14-character limit.
@@ -1301,7 +1301,7 @@
 	* sun-curs.el: Name changed from sun-cursors.el to protect the
 	innocents.
 
-1993-04-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* finder.el: Rewritten.  The Finder is now a major mode with the
 	ability to browse package commentary sections and a completely
@@ -1352,7 +1352,7 @@
 	* rot13.el (rot13-other-window): Add autoload.
 	(rot13-display-table): Use `vector', not `make-rope'.
 
-1993-04-10  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-10  Eric S. Raymond  (esr@thyrsus.com)
 
 	* gud.el (gdb, sdb, dbx): Improve prompting a la grep.
 
@@ -1369,7 +1369,7 @@
 	empty string in response to the keyword prompt, restore the old
 	window configuration properly.
 
-1993-04-09  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-04-09  Eric S. Raymond  (esr@thyrsus.com)
 
 	* emerge.el (emerge-with-ancestor): Applied Donald Erway's fix
 	patch, which included the following explanatory comment: "D.Erway
@@ -1394,7 +1394,7 @@
 
 	* autoload.el (generate-file-autoloads): Doc fix.
 
-1993-04-08  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-04-08  Eric S. Raymond  (esr@thyrsus.com)
 
 	* gud.el: Massive changes, amounting nearly to a rewrite.  The new
 	features include auto-configuring support for SVr4, more commands,
@@ -1508,7 +1508,7 @@
 	Change MIPS RISC CC regexp (last one) to
 	be anchored at bol, and to never match multiple lines.
 
-1993-04-03  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-04-03  Eric S. Raymond  (esr@thyrsus.com)
 
 	* man.el, assoc.el: Installed Barry Warsaw's new and much more
 	featureful man page browser.
@@ -1520,7 +1520,7 @@
 
 	* comint.el: New comint-read-noecho.
 
-1993-04-02  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-04-02  Eric S. Raymond  (esr@thyrsus.com)
 
 	* chistory.el (repeat-history-command): Bug fix.  Someone forgot a car.
 
@@ -1595,7 +1595,7 @@
 	editing ability and be able to abort when called from a process
 	filter.  Re-arranged and updated docstring.
 
-1993-03-30  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-30  Eric S. Raymond  (esr@thyrsus.com)
 
 	* ring.el: Changed summary line.
 
@@ -1611,7 +1611,7 @@
 
 	* buff-menu.el: Put back removed years in copyright notice.
 
-1993-03-29  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-29  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el (vc-next-action, vc-print-log, vc-diff, vc-revert-buffer):
 	Improve logic for parent buffer finding.
@@ -1652,7 +1652,7 @@
 	rlogin-password-paranoia is set.
 	(rlogin-with-args, rlogin-password): New functions.
 
-1993-03-28  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-28  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el (vc-comment-to-changelog): A useful vc-checkin hook, added.
 	(vc-checkout): Now rejects attempts to check out files via FTP.
@@ -1674,7 +1674,7 @@
 	* ebuff-menu.el (electric-buffer-menu-mode-map): fillarray isn't a
 	valid operation on maps any more.
 
-1993-03-27  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* refer.el: Installed.
 
@@ -1682,7 +1682,7 @@
 
 	* lucid.el (try-face-font, find-face, get-face): New aliases.
 
-1993-03-27  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* abbrevlist.el, old-inf-lisp.el, old-screen.el, old-shell.el,
 	* oshell.el: Removed.
@@ -1702,13 +1702,13 @@
 	(set-case-syntax-delims, set-case-syntax-pair, set-case-syntax):
 	Rename arg STRING to TABLE.  Do not set the standard case table.
 
-1993-03-26  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* loaddefs.el: Commented out function-key-error definition and
 	uses in the global keymaps.  RMS and jimb objected to the amount
 	of space these took up in the keybinding listings.
 
-1993-03-27  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* lpr.el (printify-buffer): Add, debugged from Roland McGrath's
 	printify-buffer code in LCD.
@@ -1739,7 +1739,7 @@
 	(set-visited-file-name): Kill local-write-file-hooks as local var.
 	(basic-save-buffer): Use local-write-file-hooks.
 
-1993-03-26  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* yow.el (psychoanalyze-pinhead): Needed a prefrontal lobotomy.
 	I gave it one.
@@ -1752,7 +1752,7 @@
 
 	* uncompress.el: Add provide call.
 
-1993-03-25  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* lisp-mnt.el (lm-last-modified-date): Fix return bug.
 
@@ -1784,7 +1784,7 @@
 	* term/x-win.el: Bind M-next to an alias scroll-other-window-1
 	to get better doc string output.
 
-1993-03-23  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* compile.el: Fix library headers.
 
@@ -1793,7 +1793,7 @@
 	* files.el (insert-directory): Do chase symlinks before passing
 	the directory name to ls.
 
-1993-03-23  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* buff-menu.el: Incorporated changes from Bob Weiner's enhanced
 	buff-menu from the LCD archive.
@@ -1802,7 +1802,7 @@
 
 	* replace.el (query-replace-map): Define backspace like delete.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* cookie.el: Created.  This file contains what was formerly the
 	guts of spook.el, lightly hacked to support more than one
@@ -1822,7 +1822,7 @@
 	* term/x-win.el (x-win-suspend-error):
 	suspend-hook renamed from suspend-hooks.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* help.el, register.el, replace.el, reposition.el, rfc822.el,
 	* rlogin.el, rot13.el, scribe.el, scroll-bar.el, sendmail.el,
@@ -1835,14 +1835,14 @@
 	* diary-insert.el: Change the name to diary-ins.el.
 	* calendar.el: Change all autoload references to diary-ins.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* man.el, mlconvert.el, mlsupport.el, modula2.el, mouse.el,
 	* mpuz.el, netunam.el, novice.el, nroff-mode.el, options.el,
 	* outline.el, page.el, paragraphs.el, picture.el, prolog.el,
 	* rect.el: Add or correct Commentary sections.
 
-1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* abbrev.el, ada.el, add-log.el, array.el, autoinsert.el,
 	* autoload.el, awk-mode.el, bib-mode.el, bibtex.el, buff-menu.el,
@@ -1889,19 +1889,19 @@
 	* lucid.el: Alias lower-screen and raise-screen to lower-frame and
 	raise-frame, the new names for those functions.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* bush.el: Deleted.
 
 	* finder.el: Make sure that when new keywords are compiled, we see them
 	immediately.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vt100-led.el, bg-mouse.el, sup-mouse.el, sun-mouse.el:
 	Moved to term directory.
 
-1993-03-18  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-18  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Makefile: Created.  This exists mainly so developers elsewhere
 	can unlock the lisp files to accept an update tar, then relock
@@ -1916,7 +1916,7 @@
 
 	* solar.el (solar-time-string): Round the time properly.
 
-1993-03-18  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-18  Eric S. Raymond  (esr@thyrsus.com)
 
 	* abbrev.el, abbrevlist.el, add-log.el, apropos.el, array.el,
 	* autoload.el, awk-mode.el, cal-french.el, cal-mayan.el,
@@ -1938,7 +1938,7 @@
 	* tex-mode.el (tex-send-command): Fix the command sent so that no
 	blank is inserted when replacing the asterisk with the file name.
 
-1993-03-18  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-18  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term/wyse50.el (function-key-map): Nuke code no longer bound to keys.
 
@@ -1949,7 +1949,7 @@
 	Fix things so that bindings are added to the keymap already created by
 	terminal initialization.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* help-screen.el: Installed, following release.  Now package
 	writers can easily implement help screens resembling Emacs's
@@ -1961,7 +1961,7 @@
 
 	* finder-inf.el: Deleted the RCS file.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* isearch.el, lselect.el, select.el, scroll-bar.el, texinfo.el,
 	* pending-del.el, profile.el, texinfmt.el, ls-lisp.el, meese.el,
@@ -1974,14 +1974,14 @@
 	* case-table.el, byte-run.el, ange-ftp.el, backquote.el:
 	Add or correct library header comments.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* finder.el (finder-compile-keywords): Treat nil in a path
 	argument as $PWD.
 
 	(finder-by-keyword): Handle LFD as input gracefully.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc-hooks.el: Increment version number to match vc.el's.
 
@@ -2017,7 +2017,7 @@
 	* loaddefs.el (minor-mode-alist): Make the mode line element for
 	overwrite-mode be the symbol `overwrite-mode'.
 
-1993-03-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el, vc-hooks.el: The macro vc-error-occurred has to move from
 	vc.el to vc-hooks.el for C-x C-f of a nonexistent file to work.
@@ -2074,11 +2074,11 @@
 	(rmail-summary-rmail-update): Do nothing if rmail buffer not visible.
 	(rmail-summary-mode-map): Don't bind C-n, C-p.  Use ordinary move cmds.
 
-1993-03-12  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-12  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term/x-win.el: Added library headers.
 
-1993-03-12  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-12  Eric S. Raymond  (esr@thyrsus.com)
 
 	* loaddefs.el (global-map): Fix a typo in the binding of
 	[kp-backtab].
@@ -2092,7 +2092,7 @@
 	* term/x-win.el: Cancel previous change, since it discarded
 	earlier necessary changes.
 
-1993-03-11  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-11  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term/vt100.el:
 	Added headers, commented out code the duplicates startup effects.
@@ -2115,7 +2115,7 @@
 	suspend-hooks, not suspend-hook.  The latter is an obsolete name.
 	Use add-hook instead of setting suspend-hooks directly.
 
-1993-03-11  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-11  Eric S. Raymond  (esr@thyrsus.com)
 
 	A boatload of changes to terminal support and terminal capability
 	initialization that make it a lot smarter, with a more uniform
@@ -2197,7 +2197,7 @@
 	Likewise their Meta versions.
 	Also add `ascii-character' properties.
 
-1993-03-09  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-09  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term/at386.el: Removed.  The new terminal initialization stuff
 	makes it superfluous.  I wrote it, so I should know. :-)
@@ -3300,7 +3300,7 @@
 	(ange-ftp-read-passwd, ange-ftp-process-filter): Uncomment out the
 	calls to ange-ftp-repaint-buffer.
 
-1992-11-11  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-11-11  Eric S. Raymond  (esr@thyrsus.com)
 
 	* c-mode.el (c-style-alist): Add quotes around C++ style name.
 
@@ -4680,7 +4680,7 @@
 	* compile.el (compilation-parse-errors): Write progress messages
 	on all regexp matches, not just errors.
 
-1992-08-04  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-08-04  Eric S. Raymond  (esr@thyrsus.com)
 
 	* view.el (view-mode): Teach this how to use help-char.
 
@@ -4727,7 +4727,7 @@
 
 	* etags.el (complete-tag): Error if no tags table loaded.
 
-1992-08-03  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-08-03  Eric S. Raymond  (esr@thyrsus.com)
 
 	* ebuff-menu.el, echistory.el, help.el, hexl.el: Teach these packages
 	to use help-char, and add the appropriate magic to doc strings.
@@ -5085,7 +5085,7 @@
 
 	* diff.el (diff-rcs, diff-sccs): Delete.
 
-1992-07-27  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* tar-mode.el (tar-subfile-save-buffer): Whoever changed
 	current-time forgot to check for breakage.  Added code to print
@@ -5201,7 +5201,7 @@
 	* c++-mode.el (indent-c++-exp): Fix typo "innerloop-done".
 	Make last-depth local.
 
-1992-07-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* flow-ctrl.el: Fixed set-input-mode call broken by new third
 	arg for meta control.
@@ -5266,11 +5266,11 @@
 	* byte-opt.el (disassemble-offset, byte-decompile-bytecode-1):
 	Support for relative jumps removed.
 
-1992-07-22  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-22  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Removed all Last-Modified headers.
 
-1992-07-21  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-21  Eric S. Raymond  (esr@thyrsus.com)
 
 	* files.el (trim-versions-without-asking): Non-nil, non-t value
 	suppresses all trimming of excess backups.  This is so we can make
@@ -5335,7 +5335,7 @@
 	Modified the remaining version by adding new argument GLOBAL
 	and setting the parameters locally if GLOBAL is nil.
 
-1992-07-21  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-21  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Turfed r2bibtex.el.  Refbib.el turns out to be a newer version
 	of the same package.
@@ -5484,7 +5484,7 @@
 	(find-file-noselect): Don't remove the automount prefix here; let
 	abbreviate-file-name take care of it.
 
-1992-07-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Keywords added for [n-z]*.el.  Finder now under construction.
 
@@ -5495,7 +5495,7 @@
 	ending with the latter may be deleted accidentally when space is
 	low.
 
-1992-07-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Keywords added for [a-m]*.el.  The keyword categories will
 	probably need some tuning, but at least this will suffice
@@ -5508,7 +5508,7 @@
 
 	* Changed all copying notices to GPL version 2.
 
-1992-07-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Finished decorating the library files with new standard headers.
 
@@ -5537,14 +5537,14 @@
 	* byte-run.el (defsubst): Remove extra closing paren at the end
 	of this function.
 
-1992-07-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* At RMS's request, all occurrences of `elisp' changed to `Emacs Lisp'.
 
 	* New library headers for [fghijklmn]*.el.  First steps towards
 	keyword-based code finder via Keywords header.
 
-1992-07-15  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-15  Eric S. Raymond  (esr@thyrsus.com)
 
 	* New library headers for [opqrst]*.el.  Ghod, this is boring.
 
@@ -5594,7 +5594,7 @@
 	(set-frame-height, set-frame-width): Functions deleted; they are
 	defined in frame.c.
 
-1992-07-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* [uvwxy]*.el: Added headers for new Emacs Lisp documentation
 	conventions.
@@ -5604,7 +5604,7 @@
 	* calendar.el (calendar-mode): Change key bindings for all
 	functions to make them consistent with Version 19 requirements.
 
-1992-07-13  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-13  Eric S. Raymond  (esr@thyrsus.com)
 
 	* comint.el: Minor changes to comments to reflect the fact that
 	comint has won its war and replaced shell mode.
@@ -5750,7 +5750,7 @@
 	* etags.el (visit-tags-table): Remove automounter prefixes before
 	setting tags-file-name.
 
-1992-07-06  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-07-06  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Moved gdb.el to =gdb.el.  The autoload generation for
 	loaddefs.el was getting screwed up by the conflicting autoloads
@@ -6157,7 +6157,7 @@
 
 	* info.el (Info-enable-edit): Now a user option.
 
-1992-06-03  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-06-03  Eric S. Raymond  (esr@thyrsus.com)
 
 	* sendmail.el (mail-signature): Suppress move to end of buffer if
 	we gave a prefix argument (requested by Bob Chassell).
@@ -6250,7 +6250,7 @@
 
 	* flow-ctrl.el (evade-flow-control-memstr=): Rename from memstr=.
 
-1992-05-31  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-05-31  Eric S. Raymond  (esr@thyrsus.com)
 
 	* bibtex.el: Merged in alarson's changes.
 
@@ -6261,7 +6261,7 @@
 
 	* subr.el (lambda): Add docstring.
 
-1992-05-31  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-05-31  Eric S. Raymond  (esr@thyrsus.com)
 
 	* gdb.el: Nuked --- subsumed by gdb entry point of gud.el.
 
@@ -6275,7 +6275,7 @@
 	old version still exists in the ~n~ files if this loses, but
 	the code looks good.
 
-1992-05-30  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-05-30  Eric S. Raymond  (esr@thyrsus.com)
 
 	* profile.el: Installed.
 
@@ -6715,7 +6715,7 @@
 
 	* term/new-at386.el: Rewritten to use function-key-map.
 
-1992-01-10  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1992-01-10  Eric S. Raymond  (esr@thyrsus.com)
 
 	* flow-ctrl.el: Installed.
 
@@ -6751,14 +6751,14 @@
 	(sendmail-send-it): Delete code for mail-aliases.
 	(build-mail-aliases, expand-mail-aliases): Autoloads deleted.
 
-1991-12-14  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1991-12-14  Eric S. Raymond  (esr@thyrsus.com)
 
 	* etags.el (find-tag-noselect): Fix subtle bug due to
 	save-excursion.
 
 	(tags-tag-match): New function, made smarter about exact matches.
 
-1991-12-13  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1991-12-13  Eric S. Raymond  (esr@thyrsus.com)
 
 	* perl-mode.el: Installed.
 
@@ -6767,7 +6767,7 @@
 	* sendmail.el (mail-default-headers): New user variable.
 	(mail-setup): Insert value of that variable.
 
-1991-12-11  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1991-12-11  Eric S. Raymond  (esr@thyrsus.com)
 
 	* c-mode.el: Added C++ style to c-style-alist.
 
@@ -6777,7 +6777,7 @@
 
 	* man.el (nuke-nroff-bs): Simplify o^H+.  Delete "reformatting" msg.
 
-1991-12-08  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1991-12-08  Eric S. Raymond  (esr@thyrsus.com)
 
 	* blackbox.el: Applied doc patch.  No functions affected.
 
@@ -12032,7 +12032,7 @@
 
 1988-12-22  Richard Stallman  (rms@mole.ai.mit.edu)
 
-	* term/at386.el: Eric Raymond's changes to work with keypad.el.
+	* term/at386.el: Eric S. Raymond's changes to work with keypad.el.
 
 	* loaddefs.el (completion-ignored-extensions): Add .a and .ln.
 
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index ecadb4a30d5..f0dd1295dd7 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -3384,7 +3384,7 @@
 
 	* font-lock.el (shell-font-lock-keywords): Doc fix.
 
-1994-02-02  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1994-02-02  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc-hooks.el (vc-mode-line): Use force-mode-line-update instead
 	of the Emacs 18 kluge.
@@ -3402,7 +3402,7 @@
 	* files.el (file-relative-name): Allow for ancestors as well
 	as descendants.
 
-1994-02-02  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1994-02-02  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el (vc-parse-buffer): Arrange for old properties to get
 	cleared when their match string is not found in the master file.
@@ -4811,7 +4811,7 @@
 	(add-new-page): Insert new page in specified location.
 	(original-page-delimiter): Set default value to "^^L".
 
-1993-11-15  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-11-15  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el: vc-static-header-alist shouldn't have been declared const.
 
@@ -5535,7 +5535,7 @@
 	* rmail.el (rmail-convert-to-babyl-format): Protect against
 	nonsensical content-length values.
 
-1993-10-04  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-10-04  Eric S. Raymond  (esr@thyrsus.com)
 
 	* vc.el (vc-next-action): Fix (throw ... ) invocation to work with 19;
 	allows vc-next-action on all marked files in a dired buffer to work.
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 63cf5db94c4..96bda7650e2 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -4253,7 +4253,7 @@
 	the autogenerated label in the minibuffer caused the killed text
 	to appear in front of the bibtex entry.
 
-1995-01-05  Eric S. Raymond  <esr@locke.ccil.org>
+1995-01-05  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-do-command): Change RCS handling so rcsdiff won't strip
 	away relative-pathname information.  This function no longer sets the
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 4e7366c80a8..0fc8ffcf591 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -7910,7 +7910,7 @@
 
 	* paths.el (remote-shell-program): Fix typo checking /usr/bin/remsh.
 
-1995-06-26  Eric S. Raymond  <esr@snark.thyrsus.com>
+1995-06-26  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc.el (vc-start-entry): Prevent lossage when doing a mass checkin
 	from a VC-dired buffer.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 667cd5e850a..17464042b76 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -3825,7 +3825,7 @@
 
 	* progmodes/perl-mode.el (perl-mode): Add autoload cookie.
 
-1998-04-29  Eric S. Raymond  <esr@snark.thyrsus.com>
+1998-04-29  Eric S. Raymond  <esr@thyrsus.com>
 
 	Many small changes that mostly eliminate the explicit mail separator
 	variable and use the new rfc822-goto-eoh primitive instead:
@@ -13054,7 +13054,7 @@
 	* mail/sendmail.el (mail-mode): Make adaptive-fill-regexp
 	match more values.  Bind adaptive-fill-first-line-regexp too.
 
-1997-07-26  Eric S. Raymond  <esr@snark.thyrsus.com>
+1997-07-26  Eric S. Raymond  <esr@thyrsus.com>
 
 	* telnet.el (telnet): Handle multiple telnet programs better.
 	(telnet-host-properties): New variable.
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 51d9f928ef5..cb7cff43555 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1992-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Created: 14 Jul 1992
 ;; Keywords: docs
@@ -67,7 +67,7 @@
 ;; ;;	Noah Friedman <friedman@ai.mit.edu>
 ;; ;;	Joe Wells <jbw@maverick.uswest.com>
 ;; ;;	Dave Brennan <brennan@hal.com>
-;; ;;	Eric Raymond <esr@snark.thyrsus.com>
+;; ;;	Eric S. Raymond <esr@thyrsus.com>
 ;;
 ;;    * Maintainer line --- should be a single name/address as in the Author
 ;; line, or an address only.  If there is no maintainer
diff --git a/lisp/finder.el b/lisp/finder.el
index 5aec0149b89..f5bf2641537 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1992-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Created: 16 Jun 1992
 ;; Keywords: help
 
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 1609542e5fa..eb87016695c 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995, 1998, 2000-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 559b74084e1..e5c0d6a14d2 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1993, 2001-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games, extensions
 ;; Created: Mon Mar 22 17:06:26 1993
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 2a5105fe164..0f5af9803a5 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1991, 2001-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
 
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This mode was written by Eric S. Raymond <esr@snark.thyrsus.com>,
+;; This mode was written by Eric S. Raymond <esr@thyrsus.com>,
 ;; inspired by an earlier `asm-mode' by Martin Neitzel.
 
 ;; This major mode is based on `prog-mode'.  It defines a private
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 2b178e50684..09860a4cbde 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-1996, 1998, 2000-2023 Free Software Foundation,
 ;; Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, tools
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 308ba69cb9a..017a551bc05 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-2023 Free Software Foundation, Inc.
 
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
-;;	Eric S. Raymond <esr@snark.thyrsus.com>
+;;	Eric S. Raymond <esr@thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR
 ;; Keywords: unix, tools
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 27065b73591..541b7c5aad0 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1992, 2001-2023 Free Software Foundation, Inc.
 
-;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
+;; Author: Eric S. Raymond <esr@thyrsus.com>
 ;; Keywords: terminals
 
 ;; This file is part of GNU Emacs.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 31fb11b06d7..fbfb36fdb2a 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -1250,7 +1250,7 @@
 
 	* data.c (Fdefine_function): New function (same code as Fdefalias).
 
-1993-04-28  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-28  Eric S. Raymond  (esr@thyrsus.com)
 
 	* eval.c (do_autoload): Fixed the bug in the autoload-saving code.
 
@@ -1258,7 +1258,7 @@
 
 	* keyboard.c (Fcurrent_input_mode): New function.
 
-1993-04-27  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-27  Eric S. Raymond  (esr@thyrsus.com)
 
 	* eval.c (un_autoload): Don't try to save old autoload forms when
 	we load something in.  Something about the code now conditioned
@@ -1311,7 +1311,7 @@
 	* dispnew.c (Fsleep_for, Fsit_for): Allow SECONDS to be a
 	floating point value.
 
-1993-04-26  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-26  Eric S. Raymond  (esr@thyrsus.com)
 
 	* sysdep.c (read_pending_input):
 	Fix the garbaged-modifiers bug under System Vs previous
@@ -1330,7 +1330,7 @@
 	beginning or end of the original text to float to the
 	corresponding position in the replacement text.
 
-1993-04-25  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-25  Eric S. Raymond  (esr@thyrsus.com)
 
 	* window.c (Fset-window-buffer):
 	Set horizontal-scrolling on a window to zero when
@@ -1351,7 +1351,7 @@
 	(apply_modifiers): Don't abort if you see extra modifier bits,
 	just remove them.
 
-1993-04-23  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-23  Eric S. Raymond  (esr@thyrsus.com)
 
 	* data.c (Fdefine_function):
 	Changed name back to Fdefalias, so we get things
@@ -1386,7 +1386,7 @@
 	(eval_region, eval_buffer): Call readevalloop with new arg.
 	(load_history): New variable.
 
-1993-04-16  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-04-16  Eric S. Raymond  (esr@thyrsus.com)
 
 	* lread.c (readevalloop): New argument is the source file name (or
 	nil if none).  All calls changed.  Do the two-step
@@ -1928,7 +1928,7 @@
 	* xfns.c (Fx_display_color_p): Renamed from Fx_color_display_p.
 	(syms_of_xfns): Use new name in defsubr.
 
-1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
+1993-03-19  Eric S. Raymond  (esr@thyrsus.com)
 
 	* Makefile.in (unlock, relock): New productions to assist with
 	version control.
@@ -1960,7 +1960,7 @@
 	* xfns.c (x_screen): Make this var file scope.
 	(Fx_server_version): Use Fcons, not list3.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* xterm.c (term_get_fkeys): Less klugey version of the last fix.
 
@@ -1976,7 +1976,7 @@
 	* xterm.c (x_display_box_cursor, x_display_bar_cursor): Don't
 	display the cursor on garbaged frames.
 
-1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-17  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term.c (term_get_fkeys) Supply second args for all tgetstr calls.
 
@@ -2182,7 +2182,7 @@
 	* cmd.c (internal_self_insert): Check that tab_width does not
 	exceed 20, to be consistent with indent.c and xdisp.c.
 
-1993-03-12  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-12  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term.c (CONDITIONAL_REASSIGN): Fixed reference to tigetstr.
 	This should have been tgetstr, but I typoed and tigetstr happens
@@ -2215,7 +2215,7 @@
 	(make_lispy_event): Handle menu bar events.
 	(read_key_sequence): Make dummy prefix `menu-bar' for menu bar events.
 
-1993-03-11  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
+1993-03-11  Eric S. Raymond  (esr@thyrsus.com)
 
 	* term.c (fkey_table): Added many more keycap cookies to the
 	fkey_table; it now supports the full intersection of the set of X
@@ -2289,7 +2289,7 @@
 	have the data_start symbol defined, so we'll just use the address
 	of environ.
 
-	* s/usg5-4.h: Changes from Eric Raymond:
+	* s/usg5-4.h: Changes from Eric S. Raymond:
 	If we're doing ordinary linking, define LIB_STANDARD appropriately.
 	Give LIBS_DEBUG a null definition; usg5-4 has no -lg.
 	#define LIBS_STANDARD as "-lc"; usg5-4 has no -lPW.
@@ -2297,7 +2297,7 @@
 	#define HAVE_TERMIOS instead of HAVE_TCATTR.
 	Provide our own definition of LIB_X11_LIB.
 
-	* s/usg5-3.h (LIBX11_SYSTEM): Eric Raymond says the libraries here
+	* s/usg5-3.h (LIBX11_SYSTEM): Eric S. Raymond says the libraries here
 	were slightly wrong.
 
 	* m/intel386.h (LIB_STANDARD): If USG5_4 is #defined, there's no
@@ -4335,7 +4335,7 @@
 	* Makefile.in: Rearrange dependencies to make sure that xmakefile
 	is built before we try to use it, even using a parallel make.
 
-	Changes for SYSV from Eric Raymond:
+	Changes for SYSV from Eric S. Raymond:
 	* process.c [SYSV]: Don't include <termios.h>, <termio.h>, or
 	<fcntl.h>.
 	(process_send_signal): Don't try to send SIGTSTP
@@ -6187,7 +6187,7 @@
 
 	* xterm.c: Doc fixes.
 
-	More SYSV portability changes from Eric Raymond:
+	More SYSV portability changes from Eric S. Raymond:
 
 	* xterm.c [USG5]: Don't include <sys/types.h>.
 
@@ -6222,7 +6222,7 @@
 
 1992-08-14  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-	Applied SYSV portability changes from Eric Raymond:
+	Applied SYSV portability changes from Eric S. Raymond:
 
 	* xrdb.c [USG5]: Define SYSV, and then include <unistd.h>.
 	Apparently, Xlib.h include string.h if SYSV is defined, and
@@ -6279,7 +6279,7 @@
 
 	* sysdep.c [USG5]: Don't include fcntl.h.
 
-	* s/usg5-3.h: Eric Raymond writes:
+	* s/usg5-3.h: Eric S. Raymond writes:
 	Define HAVE_SELECT and BSTRINGS only if HAVE_X_WINDOWS is on,
 	because that means we'll be linking in the shared libraries
 	containing the BSD emulations.  Teach the file about the shared
@@ -6333,7 +6333,7 @@
 	wasn't written portably, and it should probably go somewhere else
 	anyway - say, funcall or eval.
 
-	End of changes from Eric Raymond.
+	End of changes from Eric S. Raymond.
 
 	* xfns.c (Fx_create_frame): Make the default for the icon-type
 	parameter nil, not t.  It seems to cause problems with some X