Update author/maintainer info

Update email addresses and fix spellings of some author and maintainer names.
author: Paul Eggert 2019-05-26 00:58:28 -0700
committer: Paul Eggert 2019-05-26 01:00:16 -0700
commit: 852d28176990d035366142bfde36a0440a317228 (patch)
tree: 7989c0101c23d316258e92ef667090f8d0cca866
parent: 797ee5871e458d6d97f57a24405412a053f5ef32 (diff)
download: emacs-852d28176990d035366142bfde36a0440a317228.tar.gz
emacs-852d28176990d035366142bfde36a0440a317228.zip
188 files changed, 256 insertions, 262 deletions
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index fb56d23af50..b5481865ad6 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
 ;; X-RCS: $Id: srecode-template.wy,v 1.10 2009-01-09 23:01:54 zappo Exp $
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index c4ef1da3158..4c698eb7e2c 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -2421,7 +2421,7 @@ Boris Goldowsky <boris@@cs.rochester.edu> made it possible to highlight
 fine differences in Ediff buffers.  Alastair Burt <burt@@dfki.uni-kl.de>
 ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu>
 made it work with VC, Marc Paquette <marcpa@@cam.org> wrote the
-toolbar support package for Ediff, and Hrvoje Niksic <hniksic@@xemacs.org>
+toolbar support package for Ediff, and Hrvoje Nikšić <hniksic@@xemacs.org>
 adapted it to the Emacs customization package.
 Many people provided help with bug reports, feature suggestions, and advice.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index dd651fff356..6e95013c186 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1205,8 +1205,8 @@ plaintext name.
 @example
 (mail-header-parse-address
- "Hrvoje Niksic <hniksic@@srce.hr>")
+ "Hrvoje Nikšić <hniksic@@srce.hr>")
-@result{} ("hniksic@@srce.hr" . "Hrvoje Niksic")
+@result{} ("hniksic@@srce.hr" . "Hrvoje Nikšić")
 @end example
 @item mail-header-parse-addresses
@@ -1216,8 +1216,8 @@ the one described above.
 @example
 (mail-header-parse-addresses
- "Hrvoje Niksic <hniksic@@srce.hr>, Steinar Bang <sb@@metis.no>")
+ "Hrvoje Nikšić <hniksic@@srce.hr>, Steinar Bang <sb@@metis.no>")
-@result{} (("hniksic@@srce.hr" . "Hrvoje Niksic")
+@result{} (("hniksic@@srce.hr" . "Hrvoje Nikšić")
     ("sb@@metis.no" . "Steinar Bang"))
 @end example
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c11b50d3deb..540061ef6d8 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -27113,7 +27113,7 @@ Richard Mlynarik,
 Lantz Moore,
 Morioka Tomohiko, @c Morioka
 Erik Toubro Nielsen,
-Hrvoje Niksic,
+Hrvoje Nikšić,
 Andy Norman,
 Fred Oberhauser,
 C. R. Oldham,
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 7862713f47a..c51b4c35a49 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -9687,7 +9687,7 @@ If you are away from your computer, it can be very useful to have a printed
 version of some agenda views to carry around.  Org mode can export custom
 agenda views as plain text, HTML@footnote{You need to install
 @file{htmlize.el} from @uref{https://github.com/hniksic/emacs-htmlize,Hrvoje
-Niksic's repository.}}, Postscript, PDF@footnote{To create PDF output, the
+Nikšić's repository.}}, Postscript, PDF@footnote{To create PDF output, the
 ghostscript @file{ps2pdf} utility must be installed on the system.  Selecting
 a PDF file will also create the postscript file.}, and iCalendar files.  If
 you want to do this only occasionally, use the command
diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1
index 24b8b39ec1c..4317cfcb038 100644
--- a/etc/ChangeLog.1
+++ b/etc/ChangeLog.1
@@ -3395,7 +3395,7 @@
        * MORE.STUFF: Update some links, remove some dead ones.
-2007-04-04  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+2007-04-04  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
        * emacs.py (format_exception): New function.
        (eexecfile): Use it instead of traceback.print_exception.
@@ -3770,7 +3770,7 @@
        (section{TODO Items and Checkboxes}): Checkbox keys moved to this
        section, added documentation for the key `C-c #'.
-2006-11-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
+2006-11-05  Sławomir Nowaczyk  <slawek@cs.lth.se>
        * emacs.py (eargs): Provide eldoc message for builtin types.
        Make sure eargs always outputs sentinel, to avoid Emacs freeze.
@@ -3861,7 +3861,7 @@
        (eimport): Use __main__ rather than `emacs' namespace.
        (modpath): New fun.
-2006-08-20  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+2006-08-20  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
        * emacs.py (eexecfile): Use the __main__ rather than `emacs' namespace.
@@ -4122,7 +4122,7 @@
        Stefan Monnier <monnier@iro.umontreal.ca>.
        * pl-refcard.tex (section{Info}): Ditto.  Translation suggested by
-        Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>.
+        Sławomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>.
        * cs-refcard.tex (section{Info}): Use `s' instead of `M-s'.
        Entry for `i' is not translated yet.
@@ -4854,7 +4854,7 @@
        * NEWS: Lots of clarifications and cleanups.
-2005-05-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
+2005-05-05  Sławomir Nowaczyk  <slawek@cs.lth.se>
        * TUTORIAL.pl: Updated header.
@@ -5777,7 +5777,7 @@
        * ps-prin0.ps: Changed comment version (6.0).
-2000-08-24  Wlodzimierz Bzyl  <matwb@univ.gda.pl>
+2000-08-24  Włodzimierz Bzyl  <matwb@univ.gda.pl>
        * survival.tex: New file.
@@ -5852,7 +5852,7 @@
        * refcard.bit: Removed.
-2000-04-10  Wlodzimierz Bzyl  <matwb@monika.univ.gda.pl>
+2000-04-10  Włodzimierz Bzyl  <matwb@monika.univ.gda.pl>
        * refcard-pl.ps: New file.
        * refcard-pl.tex: New file.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 2b85536886c..7e28f83057a 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -58,14 +58,10 @@
 % Which mode to use is controlled by setting \columnsperpage above.
 %
 % Author (Calc reference card):
-%  Dave Gillespie
+%  Dave Gillespie <daveg@synaptics.com>
-%  UUCP: uunet!synaptx!daveg
-%  Internet: daveg@synaptics.com
 %
 % Author (refcard.tex format):
-%  Stephen Gildea
+%  Stephen Gildea <stepheng+emacs@gildea.com>
-%  UUCP: mit-erl!gildea
-%  Internet: gildea@stop.mail-abuse.org
 \input emacsver.tex
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index ca7d8333208..ec9e9a9edfd 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
 %       Milan Zamazal <pdm@zamazal.org>, August 1999
 %       Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index b91c9c927ca..bdc35cd20e1 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -2,7 +2,7 @@
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 06b6efe37de..5c8127d0738 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996, 2000-2019 Free Software Foundation,
 % Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % German translation: Sven Joachim <svenjoac@gmx.de>
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 0ebf791cd8b..467c71a86fc 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % French translation: Eric Jacoboni
 %       Micha\"el Cadilhac
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 20755497ff2..f0bbc11f12a 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index ae4e26c2863..4a51fe01c58 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -60,8 +60,7 @@
 % dvips -t landscape refcard.dvi
 %
 % Author:
-%  Stephen Gildea
+%  Stephen Gildea <stepheng+emacs@gildea.com>
-%  Internet: gildea@stop.mail-abuse.org
 %
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 578a8f6251b..54b6a10e4b4 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -3,8 +3,8 @@
 % Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
-% Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
+% Polish translation: Włodek Bzyl <matwb@univ.gda.pl>
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
 %    You will still need to cut and paste.
 % Which mode to use is controlled by setting \columnsperpage.
-% Translated into Polish language by W{\l}odek Bzyl (matwb@univ.gda.pl)
+% Translated into Polish language by Włodek Bzyl <matwb@univ.gda.pl>
 % who also added new section on `Dired' and added info about Polish
 % support in Emacs to section `International Character Sets'.
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 04ce77d0325..b7840621eea 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2019 Free
 % Software Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 5089133e954..d03e6654f0c 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 43c18d58e29..59741f31ebe 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,6 +1,6 @@
 % Copyright (C) 1997, 2002-2019 Free Software Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Russian translation: Alex Ott <alexott@gmail.com>
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 823913affcd..7ec15983346 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
 %       Milan Zamazal <pdm@zamazal.org>, August 1999
 %       Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index b63a618b060..80eb2aee08d 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -2,7 +2,7 @@
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 % Slovak translation: Miroslav Vasko <vasko@debian.cz>, March 2001
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 5dbe788ee62..b25c9af76b1 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index fb116d41f9f..00d9e3b7f5d 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -2,7 +2,7 @@
 % Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc.
-% Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper)
+% Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper)
 %       Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
 %       Masahiko Sato <ms@sail.stanford.edu> (VIP 3.5)
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index d1710c9bb84..58b931b520a 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2010, 2012-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 79b62b34589..bac247c7017 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 693cc9504c2..c896326c800 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index f7a0af65cfa..15c5c195360 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 1f1cb4e9cca..2c7403e118c 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index 659a8e9f341..3cd4d24fa61 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index 1f5a2711efa..c203536d77f 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2010, 2012-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index edf34a087f1..5cef78eac00 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 5d5a2ecf352..baa7c59fe34 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index cdb06dcc5ae..78946a75b66 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index f9e67b78014..95935449b74 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 1288acb7d3e..4aa1c0a2830 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index a651e324d3a..f0855da1b45 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 79f9dd027ba..3bbc33e72dc 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index d696cc09f7a..17f4c5a1129 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 40fe942384b..27c65bef570 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/leim/ChangeLog.1 b/leim/ChangeLog.1
index c11ba302e6b..37c2e23ff03 100644
--- a/leim/ChangeLog.1
+++ b/leim/ChangeLog.1
@@ -1254,7 +1254,7 @@
        * quail/pypunct-b5.el ("chinese-py-punct-b5"): Change the title
        Chinese characters from GB to Big5.
-2003-05-01  Wlodzimierz Bzyl  <matwb@julia.univ.gda.pl>  (tiny change)
+2003-05-01  Włodzimierz Bzyl  <matwb@julia.univ.gda.pl>  (tiny change)
        * quail/latin-pre.el ("polish-slash"): Add the rule "//"->?/.
@@ -1977,7 +1977,7 @@
        * quail/tibetan.el: Change all tibetan-1-column characters to
        tibetan.  Quail map for "tibetan-wylie" fixed.
-2000-03-31  Wlodzimierz Bzyl  <matwb@monika.univ.gda.pl>
+2000-03-31  Włodzimierz Bzyl  <matwb@monika.univ.gda.pl>
        * quail/latin-pre.el ("polish-slash"): New input method.
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 81fa459d41f..ff8a7a9fdbe 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,7 +1,7 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
   Copyright (C) 1991, 1993, 2001-2019 Free Software Foundation, Inc.
-Author:  Jonathan Kamens <jik@security.ov.com>
+Author: Jonathan Kamens <jik@security.ov.com>
 This file is part of GNU Emacs.
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 2368780b7cf..0e62bf63862 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -4,7 +4,7 @@
 # Copyright (C) 1992-1998, 2001-2019 Free Software Foundation, Inc.
-# Author: Paul Eggert <eggert@twinsun.com>
+# Author: Paul Eggert <eggert@cs.ucla.edu>
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING.
-Author: Paul Eggert <eggert@twinsun.com>'
+Author: Paul Eggert <eggert@cs.ucla.edu>'
 Help='
 Generate ChangeLog entries from RCS files (perhaps in a CVS repository)
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 0c0349c9d99..1493825ebd9 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -6156,7 +6156,7 @@
        * saveplace.el (load-save-place-alist-from-file): Use expanded name
        in both messages.
-2006-09-16  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+2006-09-16  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
        * progmodes/python.el (python-preoutput-filter):
        Fix arg order to string-match.
@@ -6540,7 +6540,7 @@
        conf-space-keywords-override local.
        Call conf-space-mode-internal directly as well as via hook.
-2006-09-09  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+2006-09-09  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
        * progmodes/python.el (python-font-lock-keywords): Add `self' and other
        quasi-keywords.
@@ -12040,7 +12040,7 @@
        * emacs-lisp/edebug.el (edebug-display): Use `edebug-sit-for-seconds'
        value instead of a literal constant (1) on more pauses.
-2006-03-03  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+2006-03-03  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
        * textmodes/flyspell.el (flyspell-external-point-words):
        Be case-sensitive.
@@ -17840,7 +17840,7 @@
        * man.el (Man-highlight-references): Doc fix.  Reformat code in a
        more Lisp-ish way.
-2005-11-19  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+2005-11-19  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
        * ls-lisp.el (ls-lisp-format-file-size): Format file size with 9
        digits, not 8, to avoid misalignment for files larger than 100MB.
@@ -18028,7 +18028,7 @@
        * cus-edit.el (face): Enclose %t in %{...%}.
-2005-11-16  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-11-16  Hrvoje Nikšić  <hniksic@xemacs.org>
        * savehist.el (savehist-mode-hook): Re-add the var.
        (savehist-mode): Use it.
@@ -18163,7 +18163,7 @@
        Use the `variable-documentation' property to give the mode hook a
        docstring and expand that docstring.
-2005-11-14  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-11-14  Hrvoje Nikšić  <hniksic@xemacs.org>
        * savehist.el (savehist-mode): Don't bother with
        `custom-set-minor-mode'.
@@ -18983,7 +18983,7 @@
        (savehist-mode) <defun>: Run the minor mode hook, set the custom state
        and emit a message if applicable.
-2005-11-01  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-11-01  Hrvoje Nikšić  <hniksic@xemacs.org>
        * savehist.el: Sync up to version 19.
        (savehist-mode): New minor mode.
@@ -19496,7 +19496,7 @@
        * simple.el (completion-common-substring):
        Use `completion-common-substring' prior to `completion-base-size'.
-2005-10-24  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-10-24  Hrvoje Nikšić  <hniksic@xemacs.org>
        * savehist.el: Require CL while compiling.
        (savehist-history-variables): Remove.
@@ -20221,7 +20221,7 @@
        (savehist-process-for-saving): Replace use of CL funs `subseq' and
        `delete-if-not'.
-2005-10-16  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-10-16  Hrvoje Nikšić  <hniksic@xemacs.org>
        * savehist.el: Newer version.
        (savehist-autosave-interval, savehist-coding-system, savehist-timer)
@@ -21480,7 +21480,7 @@
 2005-09-18  Michael Albinus  <michael.albinus@gmx.de>
        * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
-        to cover prompts like "login as:".  Reported by Slawomir Nowaczyk
+        to cover prompts like "login as:".  Reported by Sławomir Nowaczyk
        <slawomir.nowaczyk.847@student.lu.se>.
 2005-09-18  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index b22661fe819..d8519a27206 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -4156,7 +4156,7 @@
        coreutils.  Reported by Klaus Reichl
        <Klaus.Reichl@thalesgroup.com>.
-2010-11-13  Hrvoje Niksic  <hniksic@xemacs.org>
+2010-11-13  Hrvoje Nikšić  <hniksic@xemacs.org>
        * simple.el (count-words-region): New function.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index b8e0f10199c..2fe98e8f00d 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -8142,7 +8142,7 @@
        implementation) so that `locate-library' can find compressed files.
        (finder-commentary): Use it.
-1997-11-15  Hrvoje Niksic  <hniksic@srce.hr>
+1997-11-15  Hrvoje Nikšić  <hniksic@srce.hr>
        * cus-edit.el (custom-face-save): Save the face.
@@ -9078,11 +9078,11 @@
        * gnus.el: Gnus v5.4.60 is released.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-salt.el: Customized.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-salt.el (gnus-tree-show-summary): New function.
        (gnus-tree-mode-map): Use it.
@@ -9098,7 +9098,7 @@
        * gnus-sum.el (gnus-adjust-marked-articles): Improper lists.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-sum.el (gnus-summary-search-article): Inhibit updating tree
        buffer.
@@ -9213,7 +9213,7 @@
        * gnus-score.el (gnus-score-find-trace): Would bug out for
        file-less rules.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-xmas.el (gnus-xmas-group-startup-message): Cleanup.
@@ -9264,7 +9264,7 @@
        * gnus-art.el (gnus-header-button-alist): Check for URLs in the
        Subject.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-xmas.el: Cleanup.
@@ -9715,7 +9715,7 @@
        * gnus-art.el (gnus-read-save-file-name): Expand file name i save
        dir.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-art.el (gnus-signature-face): New face; use it.
@@ -9724,12 +9724,12 @@
        * gnus-picon.el (gnus-picons-insert-face-if-exists): Add picons to
        list.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * message.el (message-font-lock-keywords): Be a little bit more
        case-insensitive.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * message.el (message-insert-to): New argument FORCE.
@@ -9748,7 +9748,7 @@
        * gnus-ems.el: appt, not appt.el.
-1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-21  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-xmas.el (gnus-xmas-summary-set-display-table): Don't nix
        out in Latin1.
@@ -10150,7 +10150,7 @@
        * vc-hooks.el (vc-find-cvs-master): Add missing `throw' for
        the case when TIMESTAMP is arbitrary text.
-1997-09-30  Hrvoje Niksic  <hniksic@srce.hr>
+1997-09-30  Hrvoje Nikšić  <hniksic@srce.hr>
        * wid-edit.el (widget-plist-member): Move from here to src/fns.c;
        translated into C for efficiency.
@@ -10386,7 +10386,7 @@
        * international/mule-util.el (truncate-string-to-width): Doc typo fix.
-1997-09-14  Hrvoje Niksic  <hniksic@srce.hr>
+1997-09-14  Hrvoje Nikšić  <hniksic@srce.hr>
        * arc-mode.el: Customized.
@@ -17073,7 +17073,7 @@
        * server.el (server-kill-buffer): Prevent infinite recursion.
        (server-kill-buffer-running): New variable.
-1997-05-28  Hrvoje Niksic  <hniksic@srce.hr>
+1997-05-28  Hrvoje Nikšić  <hniksic@srce.hr>
        * dired-aux.el: Customize.
@@ -17337,7 +17337,7 @@
        * libc.el: New file.
-1997-05-22  Hrvoje Niksic  <hniksic@srce.hr>
+1997-05-22  Hrvoje Nikšić  <hniksic@srce.hr>
        * terminal.el: Use defgroup and defcustom.
        * dired.el, dired-x.el: Likewise.
@@ -18220,7 +18220,7 @@
        * vc.el: Doc fixes.
-1997-05-05  Hrvoje Niksic  <hniksic@srce.hr>
+1997-05-05  Hrvoje Nikšić  <hniksic@srce.hr>
        * time.el, gud.el, metamail.el, simple.el: Customize.
        * window.el, frame.el, menu-bar.el, lisp.el, fill.el: Customize.
@@ -18316,7 +18316,7 @@
        * ispell.el (ispell-dictionary-alist-2): Specify syntax of ' in Danish.
-1997-05-02  Hrvoje Niksic  <hniksic@srce.hr>
+1997-05-02  Hrvoje Nikšić  <hniksic@srce.hr>
        * calendar.el: Customize.
        * appt.el, cal-china.el, cal-tex.el, diary-lib.el, solar.el: Likewise.
@@ -18926,7 +18926,7 @@
        * sh-script.el (sh-while-getopts): Don't add menu-enable property.
-1997-04-15  Hrvoje Niksic  <hniksic@srce.hr>
+1997-04-15  Hrvoje Nikšić  <hniksic@srce.hr>
        * saveplace.el: Add defgroup; use defcustom for user vars.
        * pascal.el, supercite.el: Likewise.
@@ -19021,7 +19021,7 @@
        * dired.el (dired-noselect): Avoid calling file-directory-p
        when the initial argument was syntactically a directory name.
-1997-04-13  Hrvoje Niksic  <hniksic@srce.hr>
+1997-04-13  Hrvoje Nikšić  <hniksic@srce.hr>
        * time-stamp.el: Add defgroup; use defcustom for user vars.
        * eldoc.el: Likewise.
@@ -19214,7 +19214,7 @@
        * Makefile (finder-inf.el, autoloads): New targets.
        (cus-load.el): Minor simplification.
-1997-04-11  Hrvoje Niksic  <hniksic@srce.hr>
+1997-04-11  Hrvoje Nikšić  <hniksic@srce.hr>
        * add-log.el, avoid.el, bookmark.el, cl-indent.el, cmacexp.el:
        * comint.el, completion.el, dabbrev.el, desktop.el, edebug.el:
@@ -19291,7 +19291,7 @@
        * cal-islam.el (diary-islamic-date): Use `date'.
-1997-04-10  Hrvoje Niksic  <hniksic@srce.hr>
+1997-04-10  Hrvoje Nikšić  <hniksic@srce.hr>
        * ispell.el: Use defcustom for user variables.
diff --git a/lisp/battery.el b/lisp/battery.el
index 49b01d5b54b..7037d07dcf0 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
-;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
+;; Author: Ralph Schleicher <rs@ralph-schleicher.de>
 ;; Keywords: hardware
 ;; This file is part of GNU Emacs.
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 2126cfdadb1..82255a8f2a6 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
-;; Author: Paul Eggert <eggert@twinsun.com>
+;; Author: Paul Eggert <eggert@cs.ucla.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 58d1eeb60ed..9ef444dfef7 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
-;; Author: Michael Kifer <kifer@cs.sunysb.edu>
+;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
 ;; Keywords: calendar
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index b378bcfc253..d3becd5c845 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Package: cedet
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index 0a6604b8e97..e3cd7a852a8 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Package: cedet
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index 7b8be0767f8..f2fbe193621 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Old-Version: 0.2
 ;; Keywords: OO, lisp
 ;; Package: cedet
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index eeec6b5834b..ffdd9e8cdb3 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Old-Version: 0.2
 ;; Keywords: OO, lisp
 ;; Package: cedet
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el
index 285951cacc3..f708f844f36 100644
--- a/lisp/cedet/ede/config.el
+++ b/lisp/cedet/ede/config.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
-;; Author: Eric Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index f715187f4b3..ec12bbec6b8 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el
index e33f7a9a0fe..3dfb84803b7 100644
--- a/lisp/cedet/ede/detect.el
+++ b/lisp/cedet/ede/detect.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 19400c77bff..dea00106b2d 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index dbe07fbbdbe..fc74c0a07e9 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 075c4ce0a19..3706daf082b 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 8ec6d8b0b15..e06b57e39e8 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 866dce6ede5..d0904c0c155 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index 3eb11d52bfd..d3777ca7d64 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 1472108ad5e..ac3f1e9f513 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index a20046c817c..11a5eacaef0 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index fb4df489584..80b19027fc4 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el
index 5217e2d6753..2d3636006f9 100644
--- a/lisp/cedet/ede/srecode.el
+++ b/lisp/cedet/ede/srecode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index fd658fa19bf..bd3687ab550 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 1.0
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 5d174c812ee..7a9556f7846 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2004, 2006-2007, 2009-2019 Free Software
 ;; Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index e04efb30b79..e5f85599fec 100644
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 88ddd58059d..ea2e2dbd1af 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1551,7 +1551,7 @@ one in the source buffer."
 ;;; Tooltip completion lister
 ;;
-;; Written and contributed by Masatake YAMATO <jet@gyve.org>
+;; Written and contributed by Masatake YAMATO <yamato@redhat.com>
 ;;
 ;; Modified by Eric Ludlam for
 ;; * Safe compatibility for tooltip free systems.
@@ -1749,7 +1749,7 @@ Return a cons cell (X . Y)"
  (semantic-displayor-show-request obj)
  )
-;; End code contributed by Masatake YAMATO <jet@gyve.org>
+;; End code contributed by Masatake YAMATO <yamato@redhat.com>
 ;;; Ghost Text displayor
diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el
index bfc2c98044e..bbff2963314 100644
--- a/lisp/cedet/semantic/db-debug.el
+++ b/lisp/cedet/semantic/db-debug.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index e1d8f632853..949413d9682 100644
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el
index ddac96c7045..cfe5c366b54 100644
--- a/lisp/cedet/semantic/db-ref.el
+++ b/lisp/cedet/semantic/db-ref.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 8de3cc49a95..2c99b2cef3b 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 2f38d357804..a15ea9b316a 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index e0851d309b9..3b38e8a61c3 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index b005199da05..00403d4d52c 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/cscope.el b/lisp/cedet/semantic/symref/cscope.el
index 53e62a4170b..89545965bf1 100644
--- a/lisp/cedet/semantic/symref/cscope.el
+++ b/lisp/cedet/semantic/symref/cscope.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el
index 5d166699533..f23d751955c 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el
index 9bc24fbbd4e..2eb0ab091cf 100644
--- a/lisp/cedet/semantic/symref/global.el
+++ b/lisp/cedet/semantic/symref/global.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index caac757d512..d8dbfca05d5 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el
index 58cf12af2e3..9f28e16c348 100644
--- a/lisp/cedet/semantic/symref/idutils.el
+++ b/lisp/cedet/semantic/symref/idutils.el
@@ -2,7 +2,7 @@
 ;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 50aa5c5740b..c11eb310a0f 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/tag-write.el b/lisp/cedet/semantic/tag-write.el
index bb79775411d..679a15b6033 100644
--- a/lisp/cedet/semantic/tag-write.el
+++ b/lisp/cedet/semantic/tag-write.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 05040b3a95e..7722c953609 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index e8a1a2c2153..7f5600083ee 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index e6a55992336..cedc195433c 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         Jan Moringen <scymtym@users.sourceforge.net>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index 66f67790a9f..071fbe46254 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index a13c42df330..4b1f28babd5 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 06fc262f879..ad15b3ef6fd 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index 348c8126c8e..0bc8e1f450c 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el
index 7b5de0df6dd..10e304aa153 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index f4932513bcb..acb200a46ec 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 95caeb3118c..f4999827f7f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index b9b037fb500..2ff7594c4b0 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 68592265e10..f5ddc619b8c 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index cef4b9435b2..e5740964a49 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 85df930fede..43c207e9880 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index fa5d27b8d2e..08ff0e6305e 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bf1f64e125a..a47520e013a 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 93dcaff943c..ea11b0e4838 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index e6d2bb7c9e0..dc6300ea79c 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 3b271f06f71..95d8bfa1bc5 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 223cf28e12c..212b56c6ca0 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/comint.el b/lisp/comint.el
index fb324d20e24..fbb67360df6 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3471,7 +3471,7 @@ the process mark is at the beginning of the accumulated input."
    (message "Process mark set")))
-;; Author:  Peter Breton <pbreton@cs.umb.edu>
+;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; This little add-on for comint is intended to make it easy to get
 ;; output from currently active comint buffers into another buffer,
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index fa43507461d..23abe7ae165 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -82,7 +82,7 @@
 ;;  [hymie]     Hyman Rosen <marks!hymie@jyacc.jyacc.com>
 ;;  [burgett]   Steve Burgett <burgett@bizet.eecs.berkeley.edu>
 ;;  [jules]     Julian Gosnell <jules@x.co.uk>
-;;  [kifer]     Michael Kifer <kifer@sbcs.sunysb.edu>
+;;  [kifer]     Michael Kifer <kifer@cs.stonybrook.edu>
 ;;  [ake]       Ake Stenhoff <extaksf@aom.ericsson.se>
 ;;  [alon]      Alon Albert <al%imercury@uunet.uu.net>
 ;;  [tromey]    Tom Tromey <tromey@busco.lanl.gov>
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 97c057e2013..33d7643d1b7 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -124,7 +124,7 @@
 ;;            avk@rtsg.mot.com (Andrew V. Klein)     for a dired tip.
 ;;            chris@tecc.co.uk (Chris Boucher)       for a mark tip.
 ;;            f89-kam@nada.kth.se (Klas Mellbourn)   for a mh-e tip.
-;;            kifer@sbkifer.cs.sunysb.edu (M. Kifer) for a bug hunt.
+;;            kifer@cs.stonybrook.edu (M. Kifer)     for a bug hunt.
 ;;            treese@lcs.mit.edu (Win Treese)        for ange-ftp tips.
 ;;            pot@cnuce.cnr.it (Francesco Potortì)  for misc. tips.
 ;; ---------------------------------------------------------------------------
diff --git a/lisp/dframe.el b/lisp/dframe.el
index eebc0bf7bdc..473f826ad27 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -781,7 +781,7 @@ Evaluates all cached timer functions in sequence."
 ;; In XEmacs, we make popup menus work on the item over mouse (as
 ;; opposed to where the point happens to be.)  We attain this by
 ;; temporarily moving the point to that place.
-;;    Hrvoje Niksic <hniksic@srce.hr>
+;;    Hrvoje Nikšić <hrvoje.niksic@avl.com>
 (defalias 'dframe-popup-kludge
  (if (featurep 'xemacs)
      (lambda (event)                        ; XEmacs.
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 5b5cda36156..8f12858b033 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
-;; Author: Dave Love  <fx@gnu.org>
+;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: lisp, extensions
 ;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 9c29297da02..354830d9112 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2019 Free
 ;; Software Foundation, Inc.
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
 ;; Keywords: OO, chart, graph
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 7214f8aff72..203541fdfc4 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -3,7 +3,7 @@
 ;;; Copyright (C) 2000-2002, 2004-2005, 2007-2019 Free Software
 ;;; Foundation, Inc.
-;; Author: Eric M. Ludlam  <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: OO, lisp
 ;; Package: eieio
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 678d384da4a..e4ed745b25d 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 ;;
-;; Author:  Peter Breton <pbreton@cs.umb.edu>
+;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Fri Sep 27 1996
 ;; Keywords: generic, comment, font-lock
 ;; Package: emacs
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 0a1e38fe248..8d56c85bec4 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
+;; Contributor: Eric M. Ludlam <zappo@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
 ;; This file is part of GNU Emacs.
diff --git a/lisp/filecache.el b/lisp/filecache.el
index fb099c1802a..63268bf2ebc 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1996, 2000-2019 Free Software Foundation, Inc.
-;; Author:  Peter Breton <pbreton@cs.umb.edu>
+;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 10 1996
 ;; Keywords: convenience
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index c430be78ab7..4ad7379bbc8 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
-;; Author:  Peter Breton <pbreton@cs.umb.edu>
+;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996
 ;; Keywords: generic, comment, font-lock
 ;; Package: emacs
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 333da55bd82..7c59bde4914 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -1263,7 +1263,7 @@
        * gnus-uu.el (gnus-uu-default-view-rules): make sed kill ^M only
        at the end of line.
-1998-06-05  Hrvoje Niksic  <hniksic@srce.hr>
+1998-06-05  Hrvoje Nikšić  <hniksic@srce.hr>
        * nnmail.el (nnmail-get-split-group): Don't regexp-quote
        nnmail-procmail-suffix.
@@ -1334,7 +1334,7 @@
        * gnus-msg.el (gnus-bug-create-help-buffer): New variable.
        (gnus-bug): Use it.
-1998-05-07  Hrvoje Niksic  <hniksic@srce.hr>
+1998-05-07  Hrvoje Nikšić  <hniksic@srce.hr>
        * nnmail.el (nnmail-get-split-group): Use `regexp-quote'
        when file name is a part of pattern.
@@ -1346,7 +1346,7 @@
        * gnus-score.el (gnus-score-load-file): Use `regexp-quote'
        when file name is a part of pattern.
-1998-05-06  Hrvoje Niksic  <hniksic@srce.hr>
+1998-05-06  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-cache.el (gnus-cache-generate-active): Use `regexp-quote'
        when file name is a part of pattern.
@@ -2169,12 +2169,12 @@
        * nnmail.el (nnmail-purge-split-history): Alist; not a list of
        alists.
-1998-02-16  Hrvoje Niksic  <hniksic@srce.hr>
+1998-02-16  Hrvoje Nikšić  <hniksic@srce.hr>
        * message.el (message-kill-to-signature): Do the right thing when
        there is no signature.
-1998-02-16  Hrvoje Niksic  <hniksic@srce.hr>
+1998-02-16  Hrvoje Nikšić  <hniksic@srce.hr>
        * message.el (message-elide-elipsis): Add type and group.
        (message-elide-region): Docfix.
@@ -2690,7 +2690,7 @@
        * nnml.el (nnml-request-create-group): Check for files.
-1997-12-19  Hrvoje Niksic  <hniksic@srce.hr>
+1997-12-19  Hrvoje Nikšić  <hniksic@srce.hr>
        * message.el (message-mode): Fixed font-lock.
@@ -2924,12 +2924,12 @@
        * gnus-sum.el (gnus-summary-update-info): Would use wrong group
        name.
-1997-11-26  Hrvoje Niksic  <hniksic@srce.hr>
+1997-11-26  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-spec.el (gnus-compile): Avoid multiple `c*addr's.
        (gnus-compile): Require `bytecomp'.
-1997-11-25  Hrvoje Niksic  <hniksic@srce.hr>
+1997-11-25  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-util.el (gnus-prin1): Bind `print-readably' to t.
@@ -3047,13 +3047,13 @@
        * nnml.el (nnml-parse-head): Work in empty buffers.
-1997-10-14  Hrvoje Niksic  <hniksic@srce.hr>
+1997-10-14  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-xmas.el (gnus-xmas-group-startup-message): Check for image
        formats correctly.
        (gnus-xmas-modeline-glyph): Ditto.
-1997-11-24  Hrvoje Niksic  <hniksic@srce.hr>
+1997-11-24  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus-spec.el (gnus-compile): Work under XEmacs.
@@ -3337,7 +3337,7 @@
        * gnus-picon.el: Doc fixes.
-1997-09-23  Hrvoje Niksic  <hniksic@srce.hr>
+1997-09-23  Hrvoje Nikšić  <hniksic@srce.hr>
        * gnus.el: Removed definition of `custom-face-lookup'.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index bc507d59dc3..fcdc7a899d2 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -6549,12 +6549,12 @@
        * nnmail.el (nnmail-split-it): Add tracing to
        `:' split rule.
-2002-08-13  Hrvoje Niksic  <hniksic@xemacs.org>
+2002-08-13  Hrvoje Nikšić  <hniksic@xemacs.org>
        * mm-decode.el (mm-mailcap-command): Remove the quotes around '%s'
        and "%s" so we don't overquote them.
-2002-08-13  Hrvoje Niksic  <hniksic@xemacs.org>
+2002-08-13  Hrvoje Nikšić  <hniksic@xemacs.org>
        * (mm-display-external): Display the actual command that has been
        executed in the echo area.
@@ -8654,7 +8654,7 @@
        (gnus-summary-news-other-window, gnus-summary-post-news):
        Bind gnus-article-copy to nil, thereby inhibiting the `header' posting
        style match to use data from last viewed article.
-        Suggested by Hrvoje Niksic.
+        Suggested by Hrvoje Nikšić.
 2002-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
@@ -9684,7 +9684,7 @@
 2002-02-17  ShengHuo ZHU  <zsh@cs.rochester.edu>
-        Some ideas is inspired by code from Hrvoje Niksic
+        Some ideas is inspired by code from Hrvoje Nikšić
        <hniksic@arsdigita.com>
        * gnus-art.el (gnus-article-wash-function): Set the default to
@@ -15154,7 +15154,7 @@
        * mm-decode.el (mm-handle-set-external-undisplayer):
        Don't generate compiler warnings.
-2001-06-04  Hrvoje Niksic  <hniksic@arsdigita.com>
+2001-06-04  Hrvoje Nikšić  <hniksic@arsdigita.com>
        * mm-decode.el (mm-pipe-part): Bind coding-system-for-write to
        binary so that we don't transmit ISO 2022 garbage to the process.
@@ -15339,7 +15339,7 @@
        * mm-uu.el (mm-uu-configure-list): Fix customize type.
-2001-04-24  Hrvoje Niksic  <hniksic@arsdigita.com>
+2001-04-24  Hrvoje Nikšić  <hniksic@arsdigita.com>
        * mm-view.el (mm-display-inline-fontify): Allow XEmacs to fully
        fontify HANDLE.
@@ -18253,7 +18253,7 @@
        (gnus-set-global-variables): Globalize them.
        (gnus-summary-exit): Kill them.
-2000-11-02  Hrvoje Niksic  <hniksic@arsdigita.com>
+2000-11-02  Hrvoje Nikšić  <hniksic@arsdigita.com>
        * rfc2047.el (rfc2047-encoded-word-regexp): Allow empty encoded
        word.
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 3bd9f897290..b8070668efd 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -20440,7 +20440,7 @@
        * gnus-msg.el (gnus-inews-insert-gcc): Fix the mistake of using
        list, not listp.
-2005-09-02  Hrvoje Niksic  <hniksic@xemacs.org>
+2005-09-02  Hrvoje Nikšić  <hniksic@xemacs.org>
        * mm-encode.el (mm-encode-content-transfer-encoding):
        Likewise when encoding.
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 7e431e79fc7..3aaf41ccf7e 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
-;; Author: Per Abhiddenware
+;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index e69cbbc37ec..0e78f2b8992 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
-;; Author:        Didier Verna <didier@xemacs.org>
+;; Author:        Didier Verna <didier@didierverna.net>
 ;; Created:       Tue Jul 20 10:42:55 1999
 ;; Keywords:      calendar mail news
diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el
index 6a264e099a6..488c01c21cd 100644
--- a/lisp/gnus/gnus-ml.el
+++ b/lisp/gnus/gnus-ml.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
-;; Author: Julien Gilles  <jgilles@free.fr>
+;; Author: Julien Gilles <jgilles@free.fr>
 ;; Keywords: news, mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 3c69427a1e0..edbdc65d3f2 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
-;; Author:        Didier Verna <didier@xemacs.org>
+;; Author:        Didier Verna <didier@didierverna.net>
 ;; Created:       Fri Jul 16 18:55:42 1999
 ;; Keywords:      calendar mail news
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 1b42d3b505f..53275e19640 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author: David Engster <dengste@eml.cc>
+;; Author: David Engster <deng@randomsample.de>
 ;; Keywords: mail searching
 ;; Old-Version: 0.6
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 1d9d166dbac..b95f3c82388 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
-;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
+;; Authors: Didier Verna <didier@didierverna.net> (adding compaction)
 ;;      Simon Josefsson <simon@josefsson.org>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index 4bc74ce5b9a..6dcdac54623 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
-;; Authors: Ludovic Courtès <ludo@gnu.org>
+;; Author: Ludovic Courtès <ludo@gnu.org>
 ;; Keywords: news, mail
 ;; This file is part of GNU Emacs.
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1c09bc26f68..8d929b8bb09 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
-;; Author:  Dave Love <fx@gnu.org>
+;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Created: 1998-09-13
 ;; Keywords: faces, frames, emulations
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 1d761c70e19..8a484bbed1a 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
-;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
+;; Author: Ralph Schleicher <rs@ralph-schleicher.de>
-;;         (did not show signs of life (Nov 2001)  -stef)
 ;; Keywords: help languages
 ;; This file is part of GNU Emacs.
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 0a5d0ca0f94..55549c7e86e 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
-;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
+;; Author: Dan Nicolaescu <done@ece.arizona.edu>
 ;; Keywords: multilingual, Romanian, i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/leim/quail/croatian.el b/lisp/leim/quail/croatian.el
index 9d3def9827c..8fefe1cf821 100644
--- a/lisp/leim/quail/croatian.el
+++ b/lisp/leim/quail/croatian.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
-;; Author: Hrvoje Nikšić <hniksic@xemacs.org>
+;; Author: Hrvoje Nikšić <hrvoje.niksic@avl.com>
 ;; Keywords: i18n
 ;; This file is part of GNU Emacs.
diff --git a/lisp/leim/quail/vntelex.el b/lisp/leim/quail/vntelex.el
index 78b467de548..9faa5d2278f 100644
--- a/lisp/leim/quail/vntelex.el
+++ b/lisp/leim/quail/vntelex.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
-;; Author:   Werner Lemberg <wl@gnu.org>
+;; Author: Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
 ;; This file is part of GNU Emacs.
diff --git a/lisp/msb.el b/lisp/msb.el
index 7a1a338fcc1..1d43dc0dfac 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -64,7 +64,7 @@
 ;;  Larry Rosenberg <ljr@ictv.com>
 ;;  Will Henney <will@astroscu.unam.mx>
 ;;  Jari Aalto <jaalto@tre.tele.nokia.fi>
-;;  Michael Kifer <kifer@sbkifer.cs.sunysb.edu>
+;;  Michael Kifer <kifer@cs.stonybrook.edu>
 ;;  Gael Marziou <gael@gnlab030.grenoble.hp.com>
 ;;  Dave Gillespie <daveg@thymus.synaptics.com>
 ;;  Alon Albert <alon@milcse.rtsg.mot.com>
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index e61d8897651..dcc7e01b6b4 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
-;; Author:  Peter Breton <pbreton@cs.umb.edu>
+;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Mar 16 1997
 ;; Keywords: network comm
diff --git a/lisp/net/sasl-cram.el b/lisp/net/sasl-cram.el
index a4d80c92e53..cbca829b035 100644
--- a/lisp/net/sasl-cram.el
+++ b/lisp/net/sasl-cram.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
-;; Author: Daiki Ueno <ueno@unixuser.org>
+;; Author: Daiki Ueno <ueno@gnu.org>
 ;;      Kenichi OKADA <okada@opaopa.org>
 ;; Keywords: SASL, CRAM-MD5
 ;; Package: sasl
diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 492f6574e7f..bd0351644a8 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
-;; Author: Daiki Ueno <ueno@unixuser.org>
+;; Author: Daiki Ueno <ueno@gnu.org>
 ;; Keywords: SASL
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index c9f74190957..6356707a1db 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996-2000, 2002, 2007-2019 Free Software Foundation,
 ;; Inc.
-;; Author: Bill Perry <wmperry@gnu.org>
+;; Author: William M. Perry <wmperry@gnu.org>
 ;;         Dave Love <fx@gnu.org>
 ;; Keywords: comm, firewalls
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 5180d4527be..b8d58fa13ca 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -161,7 +161,7 @@
 ;; - XEmacs: Add `font-lock-value-in-major-mode' if necessary
 ;; - Removed `fast-lock-submit-bug-report' and bade farewell
 ;; 3.11--3.12:
-;; - Added Custom support (Hrvoje Niksic help)
+;; - Added Custom support (Hrvoje Nikšić help)
 ;; - Made `save-buffer-state' wrap `inhibit-point-motion-hooks'
 ;; - Made `fast-lock-cache-data' simplify calls of `font-lock-compile-keywords'
 ;; 3.12--3.13:
diff --git a/lisp/plstore.el b/lisp/plstore.el
index f24bac343a5..cd29283cfb8 100644
--- a/lisp/plstore.el
+++ b/lisp/plstore.el
@@ -1,7 +1,7 @@
 ;;; plstore.el --- secure plist store -*- lexical-binding: t -*-
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
-;; Author: Daiki Ueno <ueno@unixuser.org>
+;; Author: Daiki Ueno <ueno@gnu.org>
 ;; Keywords: PGP, GnuPG
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 50f7b4c0093..77c1e5e2d87 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1994-1995, 1997-2019 Free Software Foundation, Inc.
-;; Author: Rolf Ebert      <ebert@inf.enst.fr>
+;; Author: Rolf Ebert <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index b3a9dd480b8..ad00b59b9cc 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1319,7 +1319,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
  ;;(message "c-font-lock-declarations search from %s to %s" (point) limit)
  (c-skip-comments-and-strings limit)
  (when (< (point) limit)
-  
    (save-restriction
      (let (;; The position where `c-find-decl-spots' last stopped.
            start-pos
@@ -2773,7 +2773,7 @@ need for `pike-font-lock-extra-types'.")
                              (copy-marker (1+ start))))
      t)))
-;; GtkDoc patterns contributed by Masatake YAMATO <jet@gyve.org>.
+;; GtkDoc patterns contributed by Masatake YAMATO <yamato@redhat.com>.
 (defconst gtkdoc-font-lock-doc-comments
  (let ((symbol "[a-zA-Z0-9_]+")
diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el
index dbf7561944e..2d5a47a0797 100644
--- a/lisp/progmodes/flymake-proc.el
+++ b/lisp/progmodes/flymake-proc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
-;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
+;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.0
 ;; Keywords: c languages tools
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 4bb657e9535..83b5ee33aa0 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
-;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
+;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.0.6
 ;; Package-Requires: ((emacs "26.1"))
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el
index 51c9117cd41..84a304d1cf1 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
+;; Maintainer: JD Smith <jd.smith@utoledo.edu>
 ;; Old-Version: 1.2
 ;; Keywords: languages
 ;; Package: idlwave
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 4588e93dcf4..166a029f7dd 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -2,9 +2,9 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;;
-;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
+;; Authors: JD Smith <jd.smith@utoledo.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
+;; Maintainer: JD Smith <jd.smith@utoledo.edu>
 ;; Package: idlwave
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index a3b079830b2..efe14e82746 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2,10 +2,10 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
-;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
+;; Authors: JD Smith <jd.smith@utoledo.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
 ;;          Chris Chase <chase@att.com>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
+;; Maintainer: JD Smith <jd.smith@utoledo.edu>
 ;; Keywords: processes
 ;; Package: idlwave
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index d3b442c0567..e4cf9f4da56 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
+;; Maintainer: JD Smith <jd.smith@utoledo.edu>
 ;; Keywords: processes
 ;; Package: idlwave
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6f56ce052a0..8d9f1c9c41f 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -2,10 +2,10 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
-;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
+;; Authors: JD Smith <jd.smith@utoledo.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
 ;;          Chris Chase <chase@att.com>
-;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
+;; Maintainer: JD Smith <jd.smith@utoledo.edu>
 ;; Version: 6.1.22
 ;; Keywords: languages
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a0adaa84eeb..585612eee0b 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
-;;         Daniel Colascione <dan.colascione@gmail.com>
+;;         Daniel Colascione <dancol@dancol.org>
-;; Maintainer: Daniel Colascione <dan.colascione@gmail.com>
+;; Maintainer: Daniel Colascione <dancol@dancol.org>
 ;; Version: 9
 ;; Date: 2009-07-25
 ;; Keywords: languages, javascript
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 6dafb64ed50..8cc7f2d7d7b 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
-;; Author: Masatake YAMATO<jet@gyve.org>
+;; Author: Masatake YAMATO <yamato@redhat.com>
 ;; Keywords: languages, faces
 ;; This file is part of GNU Emacs.
diff --git a/lisp/rect.el b/lisp/rect.el
index 17907534ace..ecf6da13817 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1985, 1999-2019 Free Software Foundation, Inc.
-;; Maintainer: Didier Verna <didier@xemacs.org>
+;; Maintainer: Didier Verna <didier@didierverna.net>
 ;; Keywords: internal
 ;; Package: emacs
@@ -27,7 +27,7 @@
 ;; in the Emacs manual.
 ;; ### NOTE: this file was almost completely rewritten by Didier Verna
-;; <didier@xemacs.org> in July 1999.
+;; in July 1999.
 ;;; Code:
diff --git a/lisp/savehist.el b/lisp/savehist.el
index fb3b7483397..79ab8483868 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1997, 2005-2019 Free Software Foundation, Inc.
-;; Author: Hrvoje Niksic <hniksic@xemacs.org>
+;; Author: Hrvoje Nikšić <hrvoje.niksic@avl.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: minibuffer
 ;; Version: 24
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 4823e4ba565..451c57fe066 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -341,7 +341,7 @@ attached to and added to this list before the new frame is initialized."
                       (symbol :tag "Parameter")
                       (sexp :tag "Value"))))
-;; These values by Hrvoje Niksic <hniksic@srce.hr>
+;; These values by Hrvoje Nikšić <hrvoje.niksic@avl.com>
 (defcustom speedbar-frame-plist
  '(minibuffer nil width 20 border-width 0
               internal-border-width 0 unsplittable t
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 9265b8a52ea..0c671c43ac2 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -155,7 +155,7 @@
 ;; Euna Kim for her help in Korean, and massive thanks to the helpful
 ;; guys on the help instance on athena (zeno, jered, amu, gsstark,
 ;; ghudson, etc) Special thanks to Steve Baur, Kyle Jones, and Hrvoje
-;; Niksic for all their help.  And special thanks to Dave Gillespie
+;; Nikšić for all their help.  And special thanks to Dave Gillespie
 ;; for all the elisp help--he is responsible for helping me use the cl
 ;; macros at (near) max speed.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 0c5e6a183b5..d488c05418c 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1994-1995, 1997-2019 Free Software Foundation, Inc.
-;; Author:           Ken Stevens <k.stevens@ieee.org>
+;; Author: Ken Stevens <k.stevens@ieee.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 91e02bef513..f4236838520 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -5,7 +5,7 @@
 ;; This file is part of GNU Emacs.
-;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org>
+;; Maintainer: Stephen Gildea <stepheng+emacs@gildea.com>
 ;; Keywords: tools
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 3dd9e341351..cd09ef2af63 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -46,7 +46,7 @@
 ;;; Change Log:
 ;; Originally by Dick King <king@reasoning.com> 15 May 86
-;; Converted for Emacs 18 by Stephen Gildea <gildea@stop.mail-abuse.org>
+;; Converted for Emacs 18 by Stephen Gildea <stepheng+emacs@gildea.com>
 ;; Make uniquify-min-dir-content 0 truly non-invasive.  gildea 23 May 89
 ;; Some cleanup.  uniquify-min-dir-content default 0.  gildea 01 Jun 89
 ;; Don't rename to "".  Michael Ernst <mernst@theory.lcs.mit.edu> 15 Jun 94
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 84838135fcc..2cc0f3c40ac 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
-;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
+;; Author: Martin Lorentzson <emwson@emw.ericsson.se>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index cc1845a59f6..6fb5fa09c7e 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995, 1998-2019 Free Software Foundation, Inc.
-;; Author:      FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Package: vc
 ;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 75697e389ad..6afc599d4c8 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
-;; Author:   Dan Nicolaescu <dann@ics.uci.edu>
+;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 579448b31ca..40c392b21de 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see below for full credits)
+;; Author: FSF (see below for full credits)
 ;; Keywords: vc tools
 ;; Package: vc
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index f05e8efff90..c1cf1c2feaa 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 07b3d86b518..2d9187642c0 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 598e98250ac..d4485d88e48 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 4e9f5a025fb..805e738f7a9 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index f8475925b02..eb97a9aa5e3 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see vc.el for full credits)
+;; Author: FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: vc
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b992a8ebe09..eb6d6d331fe 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc.
-;; Author:     FSF (see below for full credits)
+;; Author: FSF (see below for full credits)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: vc tools
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 3e8b6ee838e..9047936f56b 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994, 1996, 1998, 2001-2019 Free Software Foundation,
 ;; Inc.
-;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
+;; Author: Peter Stephenson <pws@ibmth.df.unipi.it>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: virtual cursor, convenience
diff --git a/lisp/xml.el b/lisp/xml.el
index 1f3c05f4d92..09ec72f792f 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
-;; Author: Emmanuel Briot  <briot@gnat.com>
+;; Author: Emmanuel Briot <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
 ;; Keywords: xml, data
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index cab6101860d..40edccb502b 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -1607,7 +1607,7 @@
        command line option and `initial-frame-alist' which is superfluous
        after the last change to `w32_createwindow'.
-2006-11-04  Slawomir Nowaczyk  <slawek@cs.lth.se>  (tiny change)
+2006-11-04  Sławomir Nowaczyk  <slawek@cs.lth.se>  (tiny change)
        * w32proc.c (sys_wait): Only wait for processes with fd<0.
        Others should be handled by sys_select instead.  Fixes problems
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 50c748083e7..b19cf9d5ca4 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -1581,7 +1581,7 @@
        * editfns.c (Finsert_char): Doc fix.
-1998-05-02  Hrvoje Niksic  <hniksic@srce.hr>
+1998-05-02  Hrvoje Nikšić  <hniksic@srce.hr>
        * fileio.c (Fmake_temp_name): Improve randomness of generated file
        names.
@@ -1736,7 +1736,7 @@
        * blockinput.h (reinvoke_input_signal): Don't use prototype decl.
-1998-04-27  Hrvoje Niksic  <hniksic@srce.hr>
+1998-04-27  Hrvoje Nikšić  <hniksic@srce.hr>
        * fns.c (Fload_average): New arg USE_FLOATS.
@@ -1985,7 +1985,7 @@
        (read_process_output): If the process buffer isn't dead, call
        after-insert-file-set-buffer-file-coding-system.
-1998-04-18  Hrvoje Niksic  <hniksic@srce.hr>
+1998-04-18  Hrvoje Nikšić  <hniksic@srce.hr>
        * fileio.c (Fmake_temp_name): Complete rewrite.
@@ -5329,7 +5329,7 @@
        * s/aix4-1.h [! HAVE_LIBXMU] (LIBXMU): Define as empty.
        [! HAVE_LIBXMU] (NO_EDITRES): Defined.
-1997-09-30  Hrvoje Niksic  <hniksic@srce.hr>
+1997-09-30  Hrvoje Nikšić  <hniksic@srce.hr>
        * fns.c (Qwidget_type): New variable.
        (widget-plist-member, widget-put, widget-get, widget-apply): Move
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index e1a45b0b8e7..3676258040e 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -746,7 +746,7 @@
        * xfaces.c (set_lface_from_font_name): Fix incomplete merge.
-1999-12-04  Hrvoje Niksic  <hniksic@iskon.hr>
+1999-12-04  Hrvoje Nikšić  <hniksic@iskon.hr>
        * lread.c (Fintern_soft): Accept a symbol argument.
diff --git a/test/lisp/descr-text-tests.el b/test/lisp/descr-text-tests.el
index 09daddee256..d4544c99cf5 100644
--- a/test/lisp/descr-text-tests.el
+++ b/test/lisp/descr-text-tests.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2014, 2016-2019 Free Software Foundation, Inc.
-;; Author:     Michal Nazarewicz <mina86@mina86.com>
+;; Author: Michal Nazarewicz <mina86@mina86.com>
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index 2820d16254a..e89d6bb5ec0 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index 23362db4f23..67a828bb295 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el
index 0b5864d7365..c8b54db9584 100644
--- a/test/manual/cedet/ede-tests.el
+++ b/test/manual/cedet/ede-tests.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/semantic-ia-utest.el b/test/manual/cedet/semantic-ia-utest.el
index 665a5382440..10f02b3c34c 100644
--- a/test/manual/cedet/semantic-ia-utest.el
+++ b/test/manual/cedet/semantic-ia-utest.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/semantic-utest-c.el b/test/manual/cedet/semantic-utest-c.el
index a24bf10ae9a..a79c7c8822a 100644
--- a/test/manual/cedet/semantic-utest-c.el
+++ b/test/manual/cedet/semantic-utest-c.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/srecode-tests.el b/test/manual/cedet/srecode-tests.el
index 5d5a970a0ab..b849d7a6039 100644
--- a/test/manual/cedet/srecode-tests.el
+++ b/test/manual/cedet/srecode-tests.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c
index 7d6411e7ae4..2e90ef72726 100644
--- a/test/manual/cedet/tests/test.c
+++ b/test/manual/cedet/tests/test.c
@@ -2,7 +2,7 @@
   Copyright (C) 2001-2019 Free Software Foundation, Inc.
-   Author: Eric M. Ludlam <eric@siege-engine.com>
+   Author: Eric M. Ludlam <zappo@gnu.org>
   This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el
index 664e6cb4531..242186c3601 100644
--- a/test/manual/cedet/tests/test.el
+++ b/test/manual/cedet/tests/test.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/test.make b/test/manual/cedet/tests/test.make
index 60a40704f31..fe0d594c224 100644
--- a/test/manual/cedet/tests/test.make
+++ b/test/manual/cedet/tests/test.make
@@ -2,7 +2,7 @@
 # Copyright (C) 2001-2002, 2010-2019 Free Software Foundation, Inc.
-# Author: Eric M. Ludlam <eric@siege-engine.com>
+# Author: Eric M. Ludlam <zappo@gnu.org>
 # This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testdoublens.cpp b/test/manual/cedet/tests/testdoublens.cpp
index 62efad454a3..4d10644e447 100644
--- a/test/manual/cedet/tests/testdoublens.cpp
+++ b/test/manual/cedet/tests/testdoublens.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2008-2019 Free Software Foundation, Inc.
-// Author: Eric M. Ludlam <eric@siege-engine.com>
+// Author: Eric M. Ludlam <zappo@gnu.org>
 // This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testdoublens.hpp b/test/manual/cedet/tests/testdoublens.hpp
index 54f2acf168d..507c8342b4c 100644
--- a/test/manual/cedet/tests/testdoublens.hpp
+++ b/test/manual/cedet/tests/testdoublens.hpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2008-2019 Free Software Foundation, Inc.
-// Author: Eric M. Ludlam <eric@siege-engine.com>
+// Author: Eric M. Ludlam <zappo@gnu.org>
 // This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testjavacomp.java b/test/manual/cedet/tests/testjavacomp.java
index 1ebd7dc06f0..1102e518918 100644
--- a/test/manual/cedet/tests/testjavacomp.java
+++ b/test/manual/cedet/tests/testjavacomp.java
@@ -2,7 +2,7 @@
 // Copyright (C) 2009-2019 Free Software Foundation, Inc.
-//  Author: Eric M. Ludlam <eric@siege-engine.com>
+//  Author: Eric M. Ludlam <zappo@gnu.org>
 //  This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp
index cf605f60bd4..ce40fa30d5f 100644
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ b/test/manual/cedet/tests/testpolymorph.cpp
@@ -2,7 +2,7 @@
 *
 * Copyright (C) 2009-2019 Free Software Foundation, Inc.
 *
- * Author: Eric M. Ludlam <eric@siege-engine.com>
+ * Author: Eric M. Ludlam <zappo@gnu.org>
 *
 * This file is part of GNU Emacs.
 *
diff --git a/test/manual/cedet/tests/testspp.c b/test/manual/cedet/tests/testspp.c
index beead02dd2c..dafae864999 100644
--- a/test/manual/cedet/tests/testspp.c
+++ b/test/manual/cedet/tests/testspp.c
@@ -2,7 +2,7 @@
   Copyright (C) 2007-2019 Free Software Foundation, Inc.
-   Author: Eric M. Ludlam <eric@siege-engine.com>
+   Author: Eric M. Ludlam <zappo@gnu.org>
   This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c
index a76d4204307..b25f3d18712 100644
--- a/test/manual/cedet/tests/testsppreplace.c
+++ b/test/manual/cedet/tests/testsppreplace.c
@@ -1,7 +1,7 @@
 /* testsppreplace.c --- unit test for CPP/SPP Replacement
   Copyright (C) 2007-2019 Free Software Foundation, Inc.
-   Author: Eric M. Ludlam <eric@siege-engine.com>
+   Author: Eric M. Ludlam <zappo@gnu.org>
   This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c
index ab13b3a8178..4106c22ba6d 100644
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ b/test/manual/cedet/tests/testsppreplaced.c
@@ -1,7 +1,7 @@
 /* testsppreplaced.c --- unit test for CPP/SPP Replacement
   Copyright (C) 2007-2019 Free Software Foundation, Inc.
-   Author: Eric M. Ludlam <eric@siege-engine.com>
+   Author: Eric M. Ludlam <zappo@gnu.org>
   This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testsubclass.cpp b/test/manual/cedet/tests/testsubclass.cpp
index ece497b9c21..8ae28bae940 100644
--- a/test/manual/cedet/tests/testsubclass.cpp
+++ b/test/manual/cedet/tests/testsubclass.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2007-2019 Free Software Foundation, Inc.
-// Author: Eric M. Ludlam <eric@siege-engine.com>
+// Author: Eric M. Ludlam <zappo@gnu.org>
 // This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testsubclass.hh b/test/manual/cedet/tests/testsubclass.hh
index 1963e156f19..893b33eab74 100644
--- a/test/manual/cedet/tests/testsubclass.hh
+++ b/test/manual/cedet/tests/testsubclass.hh
@@ -2,7 +2,7 @@
 // Copyright (C) 2007-2019 Free Software Foundation, Inc.
-// Author: Eric M. Ludlam <eric@siege-engine.com>
+// Author: Eric M. Ludlam <zappo@gnu.org>
 // This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testtypedefs.cpp b/test/manual/cedet/tests/testtypedefs.cpp
index f8a3f2e18b5..6c6628ddf40 100644
--- a/test/manual/cedet/tests/testtypedefs.cpp
+++ b/test/manual/cedet/tests/testtypedefs.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2008-2019 Free Software Foundation, Inc.
-// Author: Eric M. Ludlam <eric@siege-engine.com>
+// Author: Eric M. Ludlam <zappo@gnu.org>
 // This file is part of GNU Emacs.
diff --git a/test/manual/cedet/tests/testvarnames.c b/test/manual/cedet/tests/testvarnames.c
index 77760724ddf..1cbf3c02c40 100644
--- a/test/manual/cedet/tests/testvarnames.c
+++ b/test/manual/cedet/tests/testvarnames.c
@@ -3,7 +3,7 @@
   Copyright (C) 2008-2019 Free Software Foundation, Inc.
-   Author: Eric M. Ludlam <eric@siege-engine.com>
+   Author: Eric M. Ludlam <zappo@gnu.org>
   This file is part of GNU Emacs.
author	Paul Eggert	2019-05-26 00:58:28 -0700
committer	Paul Eggert	2019-05-26 01:00:16 -0700
commit	852d28176990d035366142bfde36a0440a317228 (patch)
tree	7989c0101c23d316258e92ef667090f8d0cca866
parent	797ee5871e458d6d97f57a24405412a053f5ef32 (diff)
download	emacs-852d28176990d035366142bfde36a0440a317228.tar.gz emacs-852d28176990d035366142bfde36a0440a317228.zip