[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bef1be8: Fixes for "Maintainer:" and related lines
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] master bef1be8: Fixes for "Maintainer:" and related lines |
|
Date: |
Mon, 20 May 2019 00:34:35 -0400 (EDT) |
branch: master
commit bef1be873009d6e9f5a097396179f63a565bb6fd
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fixes for "Maintainer:" and related lines
Mostly, this just removes "Maintainer: address@hidden" lines,
which are not that useful. It also cleans up and regularizes a
few similar lines.
---
.gitlab-ci.yml | 2 +-
admin/authors.el | 2 --
admin/find-gc.el | 2 --
admin/last-chance.el | 1 -
autogen.sh | 1 -
build-aux/make-info-dir | 1 -
etc/tutorials/TUTORIAL.translators | 5 ++---
lisp/abbrev.el | 1 -
lisp/align.el | 1 -
lisp/array.el | 1 -
lisp/autoinsert.el | 1 -
lisp/bindings.el | 1 -
lisp/bs.el | 1 -
lisp/buff-menu.el | 1 -
lisp/case-table.el | 1 -
lisp/cdl.el | 1 -
lisp/cedet/cedet.el | 2 +-
lisp/cedet/semantic/imenu.el | 2 +-
lisp/cedet/semantic/senator.el | 1 -
lisp/cedet/semantic/wisent/python.el | 4 ++--
lisp/char-fold.el | 1 -
lisp/chistory.el | 1 -
lisp/cmuscheme.el | 1 -
lisp/comint.el | 1 -
lisp/completion.el | 1 -
lisp/composite.el | 2 +-
lisp/cus-edit.el | 1 -
lisp/cus-theme.el | 1 -
lisp/custom.el | 1 -
lisp/dabbrev.el | 1 -
lisp/delsel.el | 1 -
lisp/descr-text.el | 1 -
lisp/dired-aux.el | 1 -
lisp/dired.el | 1 -
lisp/disp-table.el | 1 -
lisp/display-fill-column-indicator.el | 1 -
lisp/display-line-numbers.el | 1 -
lisp/dnd.el | 1 -
lisp/dos-fns.el | 1 -
lisp/dos-vars.el | 1 -
lisp/dynamic-setting.el | 1 -
lisp/ebuff-menu.el | 1 -
lisp/echistory.el | 1 -
lisp/ehelp.el | 1 -
lisp/electric.el | 1 -
lisp/emacs-lisp/advice.el | 1 -
lisp/emacs-lisp/avl-tree.el | 1 -
lisp/emacs-lisp/backquote.el | 1 -
lisp/emacs-lisp/byte-opt.el | 1 -
lisp/emacs-lisp/byte-run.el | 1 -
lisp/emacs-lisp/bytecomp.el | 1 -
lisp/emacs-lisp/cconv.el | 1 -
lisp/emacs-lisp/cl-indent.el | 1 -
lisp/emacs-lisp/debug.el | 1 -
lisp/emacs-lisp/derived.el | 1 -
lisp/emacs-lisp/disass.el | 1 -
lisp/emacs-lisp/edebug.el | 1 -
lisp/emacs-lisp/eldoc.el | 2 +-
lisp/emacs-lisp/elp.el | 1 -
lisp/emacs-lisp/ewoc.el | 2 +-
lisp/emacs-lisp/float-sup.el | 1 -
lisp/emacs-lisp/helper.el | 1 -
lisp/emacs-lisp/lisp-mnt.el | 1 -
lisp/emacs-lisp/lisp-mode.el | 1 -
lisp/emacs-lisp/lisp.el | 1 -
lisp/emacs-lisp/map-ynp.el | 1 -
lisp/emacs-lisp/map.el | 2 --
lisp/emacs-lisp/regexp-opt.el | 1 -
lisp/emacs-lisp/ring.el | 1 -
lisp/emacs-lisp/rmc.el | 2 --
lisp/emacs-lisp/rx.el | 1 -
lisp/emacs-lisp/seq.el | 2 --
lisp/emacs-lisp/subr-x.el | 1 -
lisp/emacs-lisp/syntax.el | 1 -
lisp/emacs-lisp/tcover-ses.el | 4 ++--
lisp/emacs-lisp/tcover-unsafep.el | 4 ++--
lisp/emacs-lisp/thunk.el | 2 --
lisp/emacs-lisp/timer-list.el | 1 -
lisp/emacs-lisp/timer.el | 1 -
lisp/emacs-lisp/tq.el | 1 -
lisp/emacs-lisp/trace.el | 1 -
lisp/emacs-lisp/warnings.el | 1 -
lisp/emacs-lock.el | 1 -
lisp/env.el | 1 -
lisp/erc/erc-autoaway.el | 1 -
lisp/erc/erc-backend.el | 1 -
lisp/erc/erc-button.el | 1 -
lisp/erc/erc-capab.el | 2 --
lisp/erc/erc-compat.el | 1 -
lisp/erc/erc-dcc.el | 1 -
lisp/erc/erc-ezbounce.el | 1 -
lisp/erc/erc-fill.el | 1 -
lisp/erc/erc-goodies.el | 1 -
lisp/erc/erc-ibuffer.el | 1 -
lisp/erc/erc-identd.el | 1 -
lisp/erc/erc-imenu.el | 1 -
lisp/erc/erc-join.el | 1 -
lisp/erc/erc-lang.el | 1 -
lisp/erc/erc-list.el | 1 -
lisp/erc/erc-log.el | 1 -
lisp/erc/erc-match.el | 1 -
lisp/erc/erc-menu.el | 1 -
lisp/erc/erc-netsplit.el | 1 -
lisp/erc/erc-networks.el | 1 -
lisp/erc/erc-notify.el | 1 -
lisp/erc/erc-page.el | 2 --
lisp/erc/erc-pcomplete.el | 1 -
lisp/erc/erc-replace.el | 1 -
lisp/erc/erc-ring.el | 1 -
lisp/erc/erc-services.el | 2 --
lisp/erc/erc-sound.el | 2 --
lisp/erc/erc-speedbar.el | 1 -
lisp/erc/erc-spelling.el | 1 -
lisp/erc/erc-stamp.el | 1 -
lisp/erc/erc-track.el | 1 -
lisp/erc/erc-truncate.el | 1 -
lisp/erc/erc-xdcc.el | 1 -
lisp/erc/erc.el | 1 -
lisp/expand.el | 1 -
lisp/faces.el | 1 -
lisp/ffap.el | 1 -
lisp/files-x.el | 1 -
lisp/files.el | 1 -
lisp/filesets.el | 1 -
lisp/find-dired.el | 1 -
lisp/find-file.el | 1 -
lisp/flow-ctrl.el | 1 -
lisp/foldout.el | 1 -
lisp/follow.el | 1 -
lisp/font-core.el | 1 -
lisp/font-lock.el | 1 -
lisp/frame.el | 1 -
lisp/fringe.el | 1 -
lisp/help-fns.el | 1 -
lisp/help-macro.el | 1 -
lisp/help-mode.el | 1 -
lisp/help.el | 1 -
lisp/hexl.el | 1 -
lisp/hippie-exp.el | 1 -
lisp/hl-line.el | 1 -
lisp/icomplete.el | 4 ++--
lisp/ielm.el | 1 -
lisp/iimage.el | 1 -
lisp/image.el | 1 -
lisp/imenu.el | 1 -
lisp/indent.el | 1 -
lisp/info.el | 1 -
lisp/informat.el | 1 -
lisp/international/isearch-x.el | 4 ++--
lisp/international/iso-ascii.el | 1 -
lisp/international/iso-transl.el | 1 -
lisp/international/ogonek.el | 1 -
lisp/international/quail.el | 6 +++---
lisp/international/utf7.el | 1 -
lisp/isearch.el | 1 -
lisp/isearchb.el | 1 -
lisp/jka-cmpr-hook.el | 1 -
lisp/jka-compr.el | 1 -
lisp/kermit.el | 1 -
lisp/language/cyrillic.el | 2 +-
lisp/language/european.el | 2 +-
lisp/language/indian.el | 2 +-
lisp/language/thai-word.el | 2 +-
lisp/leim/quail/py-punct.el | 2 +-
lisp/leim/quail/pypunct-b5.el | 2 +-
lisp/linum.el | 1 -
lisp/loadhist.el | 1 -
lisp/loadup.el | 1 -
lisp/lpr.el | 1 -
lisp/ls-lisp.el | 1 -
lisp/macros.el | 1 -
lisp/mail/blessmail.el | 1 -
lisp/mail/emacsbug.el | 1 -
lisp/mail/feedmail.el | 2 +-
lisp/mail/hashcash.el | 1 -
lisp/mail/mail-extr.el | 1 -
lisp/mail/mail-utils.el | 1 -
lisp/mail/mailabbrev.el | 1 -
lisp/mail/mailalias.el | 1 -
lisp/mail/reporter.el | 1 -
lisp/mail/rfc822.el | 1 -
lisp/mail/rmail.el | 1 -
lisp/mail/rmailedit.el | 1 -
lisp/mail/rmailkwd.el | 1 -
lisp/mail/rmailmm.el | 1 -
lisp/mail/rmailmsc.el | 1 -
lisp/mail/rmailout.el | 1 -
lisp/mail/rmailsort.el | 1 -
lisp/mail/rmailsum.el | 1 -
lisp/mail/sendmail.el | 1 -
lisp/mail/supercite.el | 1 -
lisp/mail/undigest.el | 1 -
lisp/mail/unrmail.el | 1 -
lisp/makesum.el | 1 -
lisp/man.el | 1 -
lisp/menu-bar.el | 1 -
lisp/misc.el | 1 -
lisp/mouse.el | 1 -
lisp/msb.el | 1 -
lisp/mwheel.el | 2 +-
lisp/net/ange-ftp.el | 1 -
lisp/net/browse-url.el | 1 -
lisp/net/goto-addr.el | 1 -
lisp/net/ldap.el | 1 -
lisp/net/pop3.el | 1 -
lisp/net/socks.el | 2 +-
lisp/net/telnet.el | 1 -
lisp/newcomment.el | 2 +-
lisp/novice.el | 1 -
lisp/obarray.el | 1 -
lisp/obsolete/abbrevlist.el | 1 -
lisp/obsolete/bruce.el | 1 -
lisp/obsolete/fast-lock.el | 1 -
lisp/obsolete/gs.el | 1 -
lisp/obsolete/gulp.el | 1 -
lisp/obsolete/info-edit.el | 1 -
lisp/obsolete/lazy-lock.el | 1 -
lisp/obsolete/ledit.el | 1 -
lisp/obsolete/levents.el | 1 -
lisp/obsolete/lucid.el | 1 -
lisp/obsolete/mailpost.el | 1 -
lisp/obsolete/meese.el | 1 -
lisp/obsolete/pc-mode.el | 1 -
lisp/obsolete/rcompile.el | 1 -
lisp/obsolete/sregex.el | 1 -
lisp/obsolete/sup-mouse.el | 1 -
lisp/obsolete/terminal.el | 1 -
lisp/obsolete/yow.el | 1 -
lisp/org/ox-publish.el | 2 +-
lisp/outline.el | 1 -
lisp/paren.el | 1 -
lisp/play/cookie1.el | 1 -
lisp/play/dissociate.el | 1 -
lisp/play/doctor.el | 1 -
lisp/play/gomoku.el | 1 -
lisp/play/hanoi.el | 1 -
lisp/play/life.el | 1 -
lisp/play/spook.el | 1 -
lisp/play/studly.el | 1 -
lisp/progmodes/ada-mode.el | 2 +-
lisp/progmodes/asm-mode.el | 1 -
lisp/progmodes/cc-awk.el | 1 -
lisp/progmodes/compile.el | 1 -
lisp/progmodes/cperl-mode.el | 1 -
lisp/progmodes/dcl-mode.el | 1 -
lisp/progmodes/ebrowse.el | 1 -
lisp/progmodes/elisp-mode.el | 1 -
lisp/progmodes/etags.el | 1 -
lisp/progmodes/gdb-mi.el | 1 -
lisp/progmodes/grep.el | 1 -
lisp/progmodes/gud.el | 1 -
lisp/progmodes/make-mode.el | 1 -
lisp/progmodes/mixal-mode.el | 1 -
lisp/progmodes/modula2.el | 1 -
lisp/progmodes/octave.el | 1 -
lisp/progmodes/perl-mode.el | 1 -
lisp/progmodes/prog-mode.el | 1 -
lisp/progmodes/python.el | 1 -
lisp/progmodes/sh-script.el | 1 -
lisp/progmodes/tcl.el | 1 -
lisp/progmodes/xscheme.el | 1 -
lisp/ps-bdf.el | 2 +-
lisp/ps-def.el | 4 ++--
lisp/ps-mule.el | 4 ++--
lisp/ps-print.el | 6 +++---
lisp/ps-samp.el | 4 ++--
lisp/register.el | 1 -
lisp/replace.el | 1 -
lisp/reposition.el | 1 -
lisp/rot13.el | 1 -
lisp/savehist.el | 1 -
lisp/saveplace.el | 1 -
lisp/scroll-bar.el | 1 -
lisp/scroll-lock.el | 1 -
lisp/select.el | 1 -
lisp/server.el | 1 -
lisp/ses.el | 2 +-
lisp/shell.el | 1 -
lisp/simple.el | 1 -
lisp/skeleton.el | 1 -
lisp/sort.el | 1 -
lisp/soundex.el | 1 -
lisp/startup.el | 1 -
lisp/strokes.el | 1 -
lisp/subr.el | 1 -
lisp/t-mouse.el | 1 -
lisp/tabify.el | 1 -
lisp/talk.el | 1 -
lisp/tar-mode.el | 1 -
lisp/term/common-win.el | 1 -
lisp/term/pc-win.el | 1 -
lisp/term/tty-colors.el | 1 -
lisp/textmodes/bib-mode.el | 1 -
lisp/textmodes/fill.el | 1 -
lisp/textmodes/flyspell.el | 1 -
lisp/textmodes/makeinfo.el | 1 -
lisp/textmodes/nroff-mode.el | 1 -
lisp/textmodes/page.el | 1 -
lisp/textmodes/paragraphs.el | 1 -
lisp/textmodes/picture.el | 1 -
lisp/textmodes/refbib.el | 1 -
lisp/textmodes/refer.el | 1 -
lisp/textmodes/remember.el | 1 -
lisp/textmodes/sgml-mode.el | 1 -
lisp/textmodes/table.el | 2 +-
lisp/textmodes/tex-mode.el | 1 -
lisp/textmodes/texinfmt.el | 1 -
lisp/textmodes/texinfo.el | 1 -
lisp/textmodes/texnfo-upd.el | 1 -
lisp/textmodes/text-mode.el | 1 -
lisp/textmodes/underline.el | 1 -
lisp/thingatpt.el | 1 -
lisp/thread.el | 1 -
lisp/thumbs.el | 1 -
lisp/time.el | 2 --
lisp/tmm.el | 1 -
lisp/tutorial.el | 1 -
lisp/uniquify.el | 1 -
lisp/url/url-dav.el | 1 -
lisp/url/url-gw.el | 1 -
lisp/url/url-http.el | 1 -
lisp/url/url-util.el | 1 -
lisp/url/url.el | 1 -
lisp/userlock.el | 1 -
lisp/vc/add-log.el | 1 -
lisp/vc/compare-w.el | 1 -
lisp/vc/diff.el | 1 -
lisp/vc/vc-annotate.el | 1 -
lisp/vc/vc-bzr.el | 1 -
lisp/vc/vc-cvs.el | 1 -
lisp/vc/vc-dispatcher.el | 1 -
lisp/vc/vc-filewise.el | 1 -
lisp/vc/vc-hg.el | 1 -
lisp/vc/vc-hooks.el | 1 -
lisp/vc/vc-rcs.el | 1 -
lisp/vc/vc-sccs.el | 1 -
lisp/vc/vc-src.el | 1 -
lisp/vc/vc.el | 1 -
lisp/vcursor.el | 1 -
lisp/version.el | 1 -
lisp/view.el | 1 -
lisp/vt100-led.el | 1 -
lisp/wid-edit.el | 1 -
lisp/window.el | 1 -
lisp/woman.el | 1 -
lisp/x-dnd.el | 1 -
src/xterm.c | 2 +-
test/lisp/emacs-lisp/map-tests.el | 1 -
test/lisp/emacs-lisp/seq-tests.el | 1 -
test/lisp/emacs-lisp/thunk-tests.el | 1 -
test/lisp/help-fns-tests.el | 2 --
test/lisp/md4-tests.el | 1 -
test/lisp/org/org-tests.el | 2 --
test/lisp/soundex-tests.el | 2 --
test/lisp/vc/diff-mode-tests.el | 1 -
test/lisp/vc/smerge-mode-tests.el | 2 --
test/lisp/vc/vc-bzr-tests.el | 1 -
test/lisp/vc/vc-hg-tests.el | 1 -
test/lisp/xdg-tests.el | 1 -
test/manual/biditest.el | 1 -
test/manual/etags/el-src/emacs/lisp/progmodes/etags.el | 1 -
test/src/lcms-tests.el | 2 --
362 files changed, 46 insertions(+), 392 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92efcf6..df48764 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@
# any particular service that uses that protocol. Also, it is intended for
# evaluation purposes, thus possibly temporary.
-# Maintainer: address@hidden
+# Maintainer: Ted Zlatanov <address@hidden>
# URL: https://emba.gnu.org/emacs/emacs
image: debian:stretch
diff --git a/admin/authors.el b/admin/authors.el
index a3f8bdd..8329f3f 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1,10 +1,8 @@
-
;;; authors.el --- utility for maintaining Emacs's AUTHORS file
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: maint
;; Package: emacs
diff --git a/admin/find-gc.el b/admin/find-gc.el
index bf93c4e..9b92556 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -2,8 +2,6 @@
;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/admin/last-chance.el b/admin/last-chance.el
index 5f993be..ceed1c7 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
;; Author: Thien-Thi Nguyen <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: maint
;; Package: emacs
diff --git a/autogen.sh b/autogen.sh
index 40d0c37..f390b1a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,6 @@
## Copyright (C) 2011-2019 Free Software Foundation, Inc.
## Author: Glenn Morris <address@hidden>
-## Maintainer: address@hidden
## This file is part of GNU Emacs.
diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index 2dcac87..51f384a 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -5,7 +5,6 @@
## Copyright (C) 2013-2019 Free Software Foundation, Inc.
## Author: Glenn Morris <address@hidden>
-## Maintainer: address@hidden
## This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.translators
b/etc/tutorials/TUTORIAL.translators
index 2747d39..b6b9578 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -41,8 +41,8 @@ Maintainer: Alfredo Finelli <address@hidden>
Italian GNU Translation Group <address@hidden>
* TUTORIAL.ja:
-Author: Kenichi Handa <address@hidden>
-Maintainer: Kenichi Handa <address@hidden>
+Author: Kenichi Handa <address@hidden>
+Maintainer: Kenichi Handa <address@hidden>
* TUTORIAL.ko:
Author: Koaunghi Un <address@hidden>
@@ -94,4 +94,3 @@ Maintainer: Chao-Hong Liu <address@hidden>
;;; Local Variables:
;;; coding: utf-8
;;; End:
-
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3c88ec6..be19da5 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1992, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: abbrev convenience
;; Package: emacs
diff --git a/lisp/align.el b/lisp/align.el
index 443237b..aeb845a 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience languages lisp
;; This file is part of GNU Emacs.
diff --git a/lisp/array.el b/lisp/array.el
index 2fffe01..28635d1 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1987, 2000-2019 Free Software Foundation, Inc.
;; Author: David M. Brown
-;; Maintainer: address@hidden
;; Keywords: extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index f7ecfe2..c2ebea7 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -6,7 +6,6 @@
;; Author: Charlie Martin <address@hidden>
;; Adapted-By: Daniel Pfeiffer <address@hidden>
;; Keywords: convenience
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 744bcc3..4f09d58 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1992-1996, 1999-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/bs.el b/lisp/bs.el
index cd9524a..c564da2 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
;; Author: Olaf Sylvester <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 5f88986..c8cd25c 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1993-1995, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience
;; Package: emacs
diff --git a/lisp/case-table.el b/lisp/case-table.el
index c27e772..7474d63 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1988, 1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Howard Gayle
-;; Maintainer: address@hidden
;; Keywords: i18n
;; Package: emacs
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 752e59b..36f72ef0 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
;; Author: Ata Etemadi <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: data
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index b3d4a5d..9260cfb 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: David Ponce <address@hidden>
-;; Maintainer: Eric M. Ludlam <address@hidden>
+;; Maintainer: Eric M. Ludlam <address@hidden>
;; Version: 2.0
;; Keywords: OO, lisp
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 0fb9eca..15ab50c 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -4,7 +4,7 @@
;; Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
-;; Maintainer: Eric Ludlam
+;; Maintainer: Eric M. Ludlam <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 2462662..79bb4b2 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: David Ponce <address@hidden>
-;; Maintainer: address@hidden
;; Created: 10 Nov 2000
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/python.el
b/lisp/cedet/semantic/wisent/python.el
index c530329..c5849ff 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -2,8 +2,8 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
-;; Author: Richard Kim <address@hidden>
-;; Maintainer: Richard Kim <address@hidden>
+;; Author: Richard Kim <address@hidden>
+;; Maintainer: Richard Kim <address@hidden>
;; Created: June 2002
;; Keywords: syntax
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3e..426b1a9 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: matching
;; This file is part of GNU Emacs.
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 59bdc00..9c29bb7 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index ed6f1bf..f949a8c 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Olin Shivers <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: processes, lisp
;; This file is part of GNU Emacs.
diff --git a/lisp/comint.el b/lisp/comint.el
index d21cc13..3939371 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4,7 +4,6 @@
;; Author: Olin Shivers <address@hidden>
;; Simon Marshall <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: processes
;; Package: emacs
diff --git a/lisp/completion.el b/lisp/completion.el
index 89285c7..ff392dd 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: abbrev convenience
;; Author: Jim Salem <address@hidden> of Thinking Machines Inc.
;; (ideas suggested by Brewster Kahle)
diff --git a/lisp/composite.el b/lisp/composite.el
index d2df3d1..87f5630 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -7,7 +7,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Author: Kenichi HANDA <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
;; (according to ack.texi)
;; Keywords: mule, multilingual, character composition
;; Package: emacs
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6d47e60..e65f19d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index bc9d1d4..9846aa8 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
;;
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/custom.el b/lisp/custom.el
index 29bf9e5..e2bf871 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -4,7 +4,6 @@
;; Inc.
;;
;; Author: Per Abrahamsen <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 2159f96..f1fae18 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -6,7 +6,6 @@
;; Author: Don Morrison
;; Lars Lindberg
;; (according to ack.texi)
-;; Maintainer: address@hidden
;; Created: 16 Mars 1992
;; Lindberg's last update version: 5.7
;; Keywords: abbrev expand completion convenience
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 8f71bc6..a815b91 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Matthieu Devin <address@hidden>
-;; Maintainer: address@hidden
;; Created: 14 Jul 92
;; Keywords: convenience emulations
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 8be2b94..2976b78 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-1996, 2001-2019 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: faces, i18n, Unicode, multilingual
;; This file is part of GNU Emacs.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index aae5212..305cfd4 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Sebastian Kremer <address@hidden>.
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/dired.el b/lisp/dired.el
index ea1943d..f137d4a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Sebastian Kremer <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 4a59750..f1676bb 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -5,7 +5,6 @@
;; Author: Erik Naggum <address@hidden>
;; Based on a previous version by Howard Gayle
-;; Maintainer: address@hidden
;; Keywords: i18n
;; Package: emacs
diff --git a/lisp/display-fill-column-indicator.el
b/lisp/display-fill-column-indicator.el
index 6d5f5a9..ec89ade 100644
--- a/lisp/display-fill-column-indicator.el
+++ b/lisp/display-fill-column-indicator.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el
index d38f2e6..ac01112 100644
--- a/lisp/display-line-numbers.el
+++ b/lisp/display-line-numbers.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 459a723..82bb7c9 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
;; Author: Jan Djärv <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: window, drag, drop
;; Package: emacs
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index c575dd4..bffd540 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1991, 1993, 1995-1996, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 53de20b..0bf1013 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index cf1a8d3..ea530f9 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
;; Author: Jan Djärv <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: font, system-font, tool-bar-style
;; Package: emacs
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 6543e5f..ddfad25 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Richard Mlynarik <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/echistory.el b/lisp/echistory.el
index e932daf..8006d7b 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 2a24c98..8fc8e1f 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -4,7 +4,6 @@
;; Author: Richard Mlynarik
;; (according to ack.texi and authors.el)
-;; Maintainer: address@hidden
;; Keywords: help, extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/electric.el b/lisp/electric.el
index 07da2f1..1f4c132 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 2034f33..dfd6d2e 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 2000-2019 Free Software Foundation, Inc.
;; Author: Hans Chalupsky <address@hidden>
-;; Maintainer: address@hidden
;; Created: 12 Dec 1992
;; Keywords: extensions, lisp, tools
;; Package: emacs
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index d2a3a13..a173956 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -6,7 +6,6 @@
;; Inge Wallin <address@hidden>
;; Thomas Bellman <address@hidden>
;; Toby Cubitt <address@hidden>
-;; Maintainer: address@hidden
;; Created: 10 May 1991
;; Keywords: extensions, data structures, AVL, tree
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 5e72dc3..344a0ba 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Rick Sladkey <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions, internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 44cca61..02a9749 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -4,7 +4,6 @@
;; Author: Jamie Zawinski <address@hidden>
;; Hallvard Furuseth <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 842d1d4..811b485d 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -4,7 +4,6 @@
;; Author: Jamie Zawinski <address@hidden>
;; Hallvard Furuseth <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e76baf5..95e287c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,7 +5,6 @@
;; Author: Jamie Zawinski <address@hidden>
;; Hallvard Furuseth <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: lisp
;; Package: emacs
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 58ca9d5..21af4b6 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
;; Author: Igor Kuzmin <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: lisp
;; Package: emacs
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 10af440..ea6efbf 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -4,7 +4,6 @@
;; Author: Richard Mlynarik <address@hidden>
;; Created: July 1987
-;; Maintainer: address@hidden
;; Keywords: lisp, tools
;; Package: emacs
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 8989aa0..259f240 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1994, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: lisp, tools, maint
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 6db0584..9f7beea 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -5,7 +5,6 @@
;; Inc.
;; Author: David Megginson (address@hidden)
-;; Maintainer: address@hidden
;; Keywords: extensions
;; Package: emacs
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 3fc2224..ed3c1fb 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -4,7 +4,6 @@
;; Author: Doug Cutting <address@hidden>
;; Jamie Zawinski <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ab5553b..b8da76c 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Daniel LaLiberte <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: lisp, tools, maint
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 188d99e..23f303b 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -3,7 +3,7 @@
;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
;; Author: Noah Friedman <address@hidden>
-;; Maintainer: address@hidden
+;; Maintainer: Noah Friedman <address@hidden>
;; Keywords: extensions
;; Created: 1995-10-06
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index f0dcb51..1f8d31a 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Barry A. Warsaw
-;; Maintainer: address@hidden
;; Created: 26-Feb-1994
;; Keywords: debugging lisp tools
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index c33b465..597afdd 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -4,7 +4,7 @@
;; Author: Per Cederqvist <address@hidden>
;; Inge Wallin <address@hidden>
-;; Maintainer: address@hidden
+;; Maintainer: Stefan Monnier <address@hidden>
;; Created: 3 Aug 1992
;; Keywords: extensions, lisp
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 54c8afe..6ee378e 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1987, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index d1bd46f..4a84cfa 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: help
;; Package: emacs
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 91c7615..81adbd5 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Created: 14 Jul 1992
;; Keywords: docs
;; X-Bogus-Bureaucratic-Cruft: Gruad will get you if you don't watch out!
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fa6dc98..021708c 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: lisp, languages
;; Package: emacs
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 38df920..f653f6c 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1994, 2000-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: lisp, languages
;; Package: emacs
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index a688330..e8337a9 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1991-1995, 2000-2019 Free Software Foundation, Inc.
;; Author: Roland McGrath <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: lisp, extensions
;; Package: emacs
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 54e802e..774df3f 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -8,8 +8,6 @@
;; Package-Requires: ((emacs "25"))
;; Package: map
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 00f72e2..2753bbd 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
;; Author: Simon Marshall <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: strings, regexps, extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index c7d0268..91c043f 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 6d1adae..4c90f47 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index fdd2431..9d9028d 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: strings, regexps, extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 3413cd1..8997b75 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -7,8 +7,6 @@
;; Version: 2.21
;; Package: seq
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index b9ffe6a..3344583 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience
;; Package: emacs
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index f1904e6..f488bed 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 29b4818..8d2f821 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -2,8 +2,8 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
-;; Author: Jonathan Yavner <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
+;; Author: Jonathan Yavner <address@hidden>
+;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: spreadsheet lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/tcover-unsafep.el
b/lisp/emacs-lisp/tcover-unsafep.el
index 571f53c..daae3ad 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -2,8 +2,8 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
-;; Author: Jonathan Yavner <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
+;; Author: Jonathan Yavner <address@hidden>
+;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: safety lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index e1370c4..968dc71 100644
--- a/lisp/emacs-lisp/thunk.el
+++ b/lisp/emacs-lisp/thunk.el
@@ -7,8 +7,6 @@
;; Version: 1.0
;; Package: thunk
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/emacs-lisp/timer-list.el b/lisp/emacs-lisp/timer-list.el
index 55aa56b..3a791c2 100644
--- a/lisp/emacs-lisp/timer-list.el
+++ b/lisp/emacs-lisp/timer-list.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 22ccc35..668da42 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 4249305..ca2d2a2 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Scott Draves <address@hidden>
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: extensions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 2f271c1..0a83511 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Hans Chalupsky <address@hidden>
-;; Maintainer: address@hidden
;; Created: 15 Dec 1992
;; Keywords: tools, lisp
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 13ca605..70d6b07 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 0cded29..05b4c01 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -4,7 +4,6 @@
;; Author: Juanma Barranquero <address@hidden>
;; Inspired by emacs-lock.el by Tom Wurgler <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/env.el b/lisp/env.el
index 5a4130e..30b63a8 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1991, 1994, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: processes, unix
;; Package: emacs
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 9e224e0..298cffb 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: address@hidden
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 210830a..eb441c2 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,7 +4,6 @@
;; Filename: erc-backend.el
;; Author: Lawrence Mitchell <address@hidden>
-;; Maintainer: address@hidden
;; Created: 2004-05-7
;; Keywords: IRC chat client internet
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index c8aa887..8e2a6b9 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: irc, button, url, regexp
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcButton
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index 210a773..3d99c25 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index e724e36..3b36277 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: address@hidden
;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index a6b7532..b835191 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,6 @@
;; Author: Ben A. Mesander <address@hidden>
;; Noah Friedman <address@hidden>
;; Per Persson <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, processes
;; Created: 1994-01-23
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index a2c9336..5784e63 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 934b52a..ef876f4 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,7 +4,6 @@
;; Author: Andreas Fuchs <address@hidden>
;; Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcFilling
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 884c594..0d16aaf 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: address@hidden
;; Most code is taken verbatim from erc.el, see there for the original
;; authors.
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 149c858..ce0104b 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcIbuffer
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index d95e0ea..96b4589 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 08f52f1..e40dc1f 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcImenu
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 896521e..18cc8b5 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: irc
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index f0dbe69..765898d 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: address@hidden
;; Old-Version: 1.0.0
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcLang
;; Keywords: comm languages processes
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index d8d9e17..6a2ba78 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
;; Author: Tom Tromey <address@hidden>
-;; Maintainer: address@hidden
;; Old-Version: 0.1
;; Keywords: comm
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 4153f5c..fc12dc7 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
;; Author: Lawrence Mitchell <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: IRC, chat, client, Internet, logging
;; Created 2003-04-26
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index cc4b4a8..98ddebd 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, faces
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMatch
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 8173829..e13404c 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, processes, menu
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 87c3a61..252af71 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index eca8ad6..e92da7b 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 45dae89..9bd062a 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index cb57883..4e7fed7 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index dd2da85..e2489a8 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Sacha Chua <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, convenience
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 2e0e54a..e1c495c 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: IRC, client, Internet
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 5459d8b..54f91d1 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 886ba60..f500f4c 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 34f7ce6..38e0b28 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 0a1e38f..833ad2f 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,7 +4,6 @@
;; Author: Mario Lang <address@hidden>
;; Contributor: Eric M. Ludlam <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 69a83fa..8df7ea9 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: irc
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 860fdbb..541c67a 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, processes, timestamp
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index e51e605..14e86c1 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, faces
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcChannelTracking
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 0417429..73c7316 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: IRC, chat, client, Internet, logging
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 162b22e..20a91b7 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d1fa5c7..fc0f612 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -10,7 +10,6 @@
;; Gergely Nagy (address@hidden)
;; David Edmondson (address@hidden)
;; Kelvin White (address@hidden)
-;; Maintainer: address@hidden
;; Keywords: IRC, chat, client, Internet
;; Version: 5.3
diff --git a/lisp/expand.el b/lisp/expand.el
index 0c4d343..7eaf7fd 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
;; Author: Frederic Lepied <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: abbrev
;; This file is part of GNU Emacs.
diff --git a/lisp/faces.el b/lisp/faces.el
index 89b5986..137ce99 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 08f7208..4e91a7a 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
;; Author: Michelangelo Grigni <address@hidden>
-;; Maintainer: address@hidden
;; Created: 29 Mar 1993
;; Keywords: files, hypermedia, matching, mouse, convenience
diff --git a/lisp/files-x.el b/lisp/files-x.el
index b71e920..0d156db 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
;; Author: Juri Linkov <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/files.el b/lisp/files.el
index 1dec0ed..21fa614 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1987, 1992-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index b74b4a8..05c30de 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Thomas Link <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: filesets convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index ef137be..578f765 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -5,7 +5,6 @@
;; Author: Roland McGrath <address@hidden>,
;; Sebastian Kremer <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: unix
;; This file is part of GNU Emacs.
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 8731408..f93d2a0 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -1,7 +1,6 @@
;;; find-file.el --- find a file corresponding to this one given a pattern
;; Author: Henry Guillaume <address@hidden, address@hidden>
-;; Maintainer: address@hidden
;; Keywords: c, matching, tools
;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index e92b6b4..0b95efa 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: hardware
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 3ef88fe..2eae65a 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Kevin Broadey <address@hidden>
-;; Maintainer: address@hidden
;; Created: 27 Jan 1994
;; Version: 1.10
;; Keywords: folding, outlines
diff --git a/lisp/follow.el b/lisp/follow.el
index acc2b26..47e7aa4 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Anders Lindgren
-;; Maintainer: address@hidden
;; Created: 1995-05-25
;; Keywords: display, window, minor-mode, convenience
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 6b26f0c..da6c91b 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: languages, faces
;; Package: emacs
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3991a4e..b0e4598 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -5,7 +5,6 @@
;; Author: Jamie Zawinski
;; Richard Stallman
;; Stefan Monnier
-;; Maintainer: address@hidden
;; Keywords: languages, faces
;; Package: emacs
diff --git a/lisp/frame.el b/lisp/frame.el
index a8c230c..8e0738f 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 1996-1997, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 92387a2..632efa8 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Simon Josefsson <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: frames
;; Package: emacs
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 50d69e7..9d99736 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help, internal
;; Package: emacs
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index a16d1e3..9c90d6d 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Lynn Slater <address@hidden>
-;; Maintainer: address@hidden
;; Created: Mon Oct 1 11:42:39 1990
;; Adapted-By: ESR
;; Package: emacs
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 6cc3f0d..304c45d 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help, internal
;; Package: emacs
diff --git a/lisp/help.el b/lisp/help.el
index 42ff375..0677368 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help, internal
;; Package: emacs
diff --git a/lisp/hexl.el b/lisp/hexl.el
index ee5a9c0..df501df 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Keith Gabryelski <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: data
;; This file is part of GNU Emacs.
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 404f448..17d3dc7 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
;; Author: Anders Holst <address@hidden>
-;; Maintainer: address@hidden
;; Version: 1.6
;; Keywords: abbrev convenience
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1c09bc2..e4fef21 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Dave Love <address@hidden>
-;; Maintainer: address@hidden
;; Created: 1998-09-13
;; Keywords: faces, frames, emulations
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 10fd3a6..698025e 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -3,8 +3,8 @@
;; Copyright (C) 1992-1994, 1997, 1999, 2001-2019 Free Software
;; Foundation, Inc.
-;; Author: Ken Manheimer <address@hidden>
-;; Maintainer: Ken Manheimer <address@hidden>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
;; Created: Mar 1993 Ken Manheimer, address@hidden - first release to usenet
;; Keywords: help, abbrev
diff --git a/lisp/ielm.el b/lisp/ielm.el
index c7a31a2..1531415 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
;; Author: David Smith <address@hidden>
-;; Maintainer: address@hidden
;; Created: 25 Feb 1994
;; Keywords: lisp
diff --git a/lisp/iimage.el b/lisp/iimage.el
index e51108e..17b715a 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
;; Author: KOSEKI Yoshinori <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: multimedia
;; This file is part of GNU Emacs.
diff --git a/lisp/image.el b/lisp/image.el
index db11302..6cc2cc3 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: multimedia
;; Package: emacs
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 5084fe6..6e16e13 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -4,7 +4,6 @@
;; Author: Ake Stenhoff <address@hidden>
;; Lars Lindberg <address@hidden>
-;; Maintainer: address@hidden
;; Created: 8 Feb 1994
;; Keywords: tools convenience
diff --git a/lisp/indent.el b/lisp/indent.el
index bf87d6a..1dbece7 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 1995, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/info.el b/lisp/info.el
index c211887..6180395 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1986, 1992-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help
;; This file is part of GNU Emacs.
diff --git a/lisp/informat.el b/lisp/informat.el
index 8108ffe..246b3b9 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1986, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help
;; This file is part of GNU Emacs.
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 6c2a2dc..c12e7b3 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -8,8 +8,8 @@
;; Keywords: i18n, multilingual, isearch
-;; Author: Kenichi HANDA <address@hidden>
-;; Maintainer: Kenichi HANDA <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
+;; Maintainer: Kenichi Handa <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 395e6c4..b317b8a 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Howard Gayle
-;; Maintainer: address@hidden
;; Keywords: i18n
;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index b573e1e..14da02c 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Howard Gayle
-;; Maintainer: address@hidden
;; Keywords: i18n
;; This file is part of GNU Emacs.
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index 543f2e3..fd68137 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -4,7 +4,6 @@
;; Author: Włodek Bzyl
;; Ryszard Kubiak
-;; Maintainer: address@hidden
;; Keywords: i18n
;; This file is part of GNU Emacs.
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 3266b93..2683118 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -6,9 +6,9 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Author: Kenichi HANDA <address@hidden>
-;; Naoto TAKAHASHI <address@hidden>
-;; Maintainer: Kenichi HANDA <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
+;; Naoto Takahashi <address@hidden>
+;; Maintainer: Kenichi Handa <address@hidden>
;; Keywords: mule, multilingual, input method, i18n
;; This file is part of GNU Emacs.
diff --git a/lisp/international/utf7.el b/lisp/international/utf7.el
index 0e67a62..f22fb8d 100644
--- a/lisp/international/utf7.el
+++ b/lisp/international/utf7.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Jon K Hellan <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index bb29c29..5aaeae4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-1997, 1999-2019 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: matching
;; Package: emacs
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index ee392b3..dc18368 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
-;; Maintainer: address@hidden
;; Created: 16 Apr 2004
;; Version: 1.5
;; Keywords: lisp
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 3aa84f4..b6ff9f1 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Jay K. Adams <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: data
;; Package: emacs
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 63fb449..8c9dd8a 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Jay K. Adams <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: data
;; This file is part of GNU Emacs.
diff --git a/lisp/kermit.el b/lisp/kermit.el
index f6ed1fb..77c2cbd 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
;; Author: Jeff Norden <address@hidden>
-;; Maintainer: address@hidden
;; Created: 15 Feb 1988
;; Keywords: comm
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 75d4249..564ac5f 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -9,7 +9,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
-;; Author: Kenichi Handa <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
;; Keywords: multilingual, Cyrillic, i18n
;; This file is part of GNU Emacs.
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 8c38175..fedbca4 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -525,7 +525,7 @@ method and applying Turkish case rules for the characters
i, I, ı, İ.")))
(set-case-syntax ?ı "w" table)))
;; Polish ISO 8859-2 environment.
-;; Maintainer: Wlodek Bzyl <address@hidden>
+;; Maintainer: Włodek Bzyl <address@hidden>
;; Keywords: multilingual, Polish
(set-language-info-alist
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d63e9b4..894a015 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -5,7 +5,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Maintainer: Kenichi Handa <address@hidden>
+;; Maintainer: Kenichi Handa <address@hidden>
;; KAWABATA, Taichi <address@hidden>
;; Keywords: multilingual, i18n, Indian
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index e67dd09..94c6ab9 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -4,7 +4,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Author: Kenichi HANDA <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
;; Keywords: thai, word break, emacs
diff --git a/lisp/leim/quail/py-punct.el b/lisp/leim/quail/py-punct.el
index eed70a8..49ea66e 100644
--- a/lisp/leim/quail/py-punct.el
+++ b/lisp/leim/quail/py-punct.el
@@ -6,7 +6,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Author: Ken'ichi HANDA <address@hidden>
+;; Author: Ken'ichi Handa <address@hidden>
;; Keywords: multilingual, input method, Chinese
diff --git a/lisp/leim/quail/pypunct-b5.el b/lisp/leim/quail/pypunct-b5.el
index 45597a4..9f4e73c 100644
--- a/lisp/leim/quail/pypunct-b5.el
+++ b/lisp/leim/quail/pypunct-b5.el
@@ -5,7 +5,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-;; Author: Ken'ichi HANDA <address@hidden>
+;; Author: Ken'ichi Handa <address@hidden>
;; Keywords: multilingual, input method, Chinese
diff --git a/lisp/linum.el b/lisp/linum.el
index 0b4b008..6fe3057 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
;; Author: Markus Triska <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience
;; Version: 0.9x
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 4e5d8e0..69f2c0b 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 67e8aa7..c43d147 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1992, 1994, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 436f9e3..17a37f1 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: unix
;; This file is part of GNU Emacs.
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 1f2c468..7ab97eb 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -4,7 +4,6 @@
;; Author: Sebastian Kremer <address@hidden>
;; Modified by: Francis J. Wright <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: unix, dired
;; Package: emacs
diff --git a/lisp/macros.el b/lisp/macros.el
index 4b38506..b9020a2 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: abbrev
;; Package: emacs
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 62094bf..2a2ff3d 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index c637e24..2cd6d56 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: maint mail
;; Package: emacs
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index a90d9c4..180e32b 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1657,7 +1657,7 @@ local gurus."
(declare-function smtp-via-smtp "ext:smtp" (sender recipients
smtp-text-buffer))
(defvar smtp-server)
-;; FLIM's smtp.el pointed out to me by Kenichi Handa <address@hidden>
+;; FLIM's smtp.el pointed out to me by Kenichi Handa <address@hidden>
(defun feedmail-buffer-to-smtp (prepped errors-to addr-listoid)
"Function which actually calls smtp-via-smtp to send buffer as e-mail."
(feedmail-say-debug ">in-> feedmail-buffer-to-smtp %s" addr-listoid)
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 6068952..ec17d66 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003-2005, 2007-2019 Free Software Foundation, Inc.
;; Written by: Paul Foley <address@hidden> (1997-2002)
-;; Maintainer: address@hidden
;; Keywords: mail, hashcash
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index c1e90c3..e610806 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Joe Wells <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: mail-utils
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index cbcbdfa..f561c08 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail, news
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index d59df88..17f4f0c 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: Jamie Zawinski <address@hidden; now address@hidden>
-;; Maintainer: address@hidden
;; Created: 19 Oct 90
;; Keywords: mail
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 42896c1..68e44f8 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1987, 1995-1997, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 10db110..3172c97 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
;; Author: 1993-1998 Barry A. Warsaw
-;; Maintainer: address@hidden
;; Created: 19-Apr-1993
;; Keywords: maint mail tools
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index a53a77e..4cf624c 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Richard Mlynarik <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 91291b8..d0ebf7d 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1988, 1993-1998, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 01d5524..a9ce1e6 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 9427796..ee71ab4 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1988, 1994, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index af52813..d32147f 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -4,7 +4,6 @@
;; Author: Alexander Pohoyda
;; Alex Schroeder
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index ba0c2ae..4c42935 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 12d3761..d956708 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1987, 1993-1994, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 4a70103..18185ec 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Masanobu UMEDA <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 79a322c..80cfbfd 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1993-1996, 2000-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; Package: rmail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 208ebb6..0db0557 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index ad69dca..3173246 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: 1993 Barry A. Warsaw <address@hidden>
-;; Maintainer: address@hidden
;; Created: February 1993
;; Keywords: mail, news
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index bbf3c83..499f16e 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1994, 1996, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 4d9ad67..c409210 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 10ad78e..847e304 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help
;; This file is part of GNU Emacs.
diff --git a/lisp/man.el b/lisp/man.el
index d52ca21..feb0e09 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Barry A. Warsaw <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: help
;; Adapted-By: ESR, pot
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 4ff60ed..d12cdd7 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
;; Author: Richard M. Stallman
-;; Maintainer: address@hidden
;; Keywords: internal, mouse
;; Package: emacs
diff --git a/lisp/misc.el b/lisp/misc.el
index 4cf6cad..0080762 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience
;; Package: emacs
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8428c1e..af53c05 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: hardware, mouse
;; Package: emacs
diff --git a/lisp/msb.el b/lisp/msb.el
index 7a1a338..b626624 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1995, 1997-2019 Free Software Foundation, Inc.
;; Author: Lars Lindberg <address@hidden>
-;; Maintainer: address@hidden
;; Created: 8 Oct 1993
;; Lindberg's last update version: 3.34
;; Keywords: mouse buffer menu
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 23f491d..86788fc 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,7 @@
;;; mwheel.el --- Wheel mouse support
;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: William M. Perry <address@hidden>
+;; Maintainer: Bill Perry <address@hidden>
;; Keywords: mouse
;; Package: emacs
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b0a1e17..81b654c 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Andy Norman (address@hidden)
-;; Maintainer: address@hidden
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index aa31e25..0c63cbd 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
;; Author: Denis Howe <address@hidden>
-;; Maintainer: address@hidden
;; Created: 03 Apr 1995
;; Keywords: hypertext, hypermedia, mouse
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index c25d787..d7fd058 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 2000-2019 Free Software Foundation, Inc.
;; Author: Eric Ding <address@hidden>
-;; Maintainer: address@hidden
;; Created: 15 Aug 1995
;; Keywords: mh-e, www, mouse, mail
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 75fc7d6..2df473c 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <address@hidden>
-;; Maintainer: address@hidden
;; Created: April 1998
;; Keywords: comm
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 599e230..1911450 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
;; Author: Richard L. Pieri <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 6356707..c9f7419 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: William M. Perry <address@hidden>
+;; Author: Bill Perry <address@hidden>
;; Dave Love <address@hidden>
;; Keywords: comm, firewalls
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index cf3634f..465927d 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: William F. Schelter
-;; Maintainer: address@hidden
;; Keywords: unix, comm
;; This file is part of GNU Emacs.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index ab2be08..ac706b9 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -3,7 +3,7 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: code extracted from Emacs-20's simple.el
-;; Maintainer: Stefan Monnier <address@hidden>
+;; Maintainer: Stefan Monnier <address@hidden>
;; Keywords: comment uncomment
;; Package: emacs
diff --git a/lisp/novice.el b/lisp/novice.el
index 3da4e25..1da4b71 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1994, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: internal, help
;; This file is part of GNU Emacs.
diff --git a/lisp/obarray.el b/lisp/obarray.el
index c83d5d4..fbab506 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: obarray functions
;; Package: emacs
diff --git a/lisp/obsolete/abbrevlist.el b/lisp/obsolete/abbrevlist.el
index e2bf14f..dfd7b2b 100644
--- a/lisp/obsolete/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1986, 1992, 2001-2019 Free Software Foundation, Inc.
;; Suggested by a previous version by Gildea.
-;; Maintainer: address@hidden
;; Keywords: abbrev
;; Package: emacs
;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index fba54c1..8044a0e 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -4,7 +4,6 @@
;; Copyright (C) 1988, 1993, 1997, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: games
;; Created: Jan 1997
;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 5180d45..10af6ab 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
;; Author: Simon Marshall <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: faces files
;; Version: 3.14
;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/gs.el b/lisp/obsolete/gs.el
index cfdc9dc..24c9b67 100644
--- a/lisp/obsolete/gs.el
+++ b/lisp/obsolete/gs.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Obsolete-since: 26.1
diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el
index bdb3406..373ee35 100644
--- a/lisp/obsolete/gulp.el
+++ b/lisp/obsolete/gulp.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
;; Author: Sam Shteingold <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: maint
;; Obsolete-since: 25.1
diff --git a/lisp/obsolete/info-edit.el b/lisp/obsolete/info-edit.el
index b64e840..e520faf 100644
--- a/lisp/obsolete/info-edit.el
+++ b/lisp/obsolete/info-edit.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1986, 1992-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help
;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 44f8528..5167928 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
;; Author: Simon Marshall <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: faces files
;; Version: 2.11
;; Obsolete-since: 22.1
diff --git a/lisp/obsolete/ledit.el b/lisp/obsolete/ledit.el
index 6383a42..91efa29 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: languages
;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 714b3fb..f2b081d 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: emulations
;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index d1b702e..9d0c5da 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: emulations
;; Obsolete-since: 23.2
diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el
index 2f74faf..33cc43c 100644
--- a/lisp/obsolete/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -6,7 +6,6 @@
;; This file is part of GNU Emacs.
;; Author: Gary Delp <address@hidden>
-;; Maintainer: address@hidden
;; Created: 13 Jan 1986
;; Keywords: mail
;; Obsolete-since: 24.3
diff --git a/lisp/obsolete/meese.el b/lisp/obsolete/meese.el
index 81739df..190db94 100644
--- a/lisp/obsolete/meese.el
+++ b/lisp/obsolete/meese.el
@@ -5,7 +5,6 @@
;; This file is part of GNU Emacs.
-;; Maintainer: address@hidden
;; Keywords: games
;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el
index 6d1a456..4908b51 100644
--- a/lisp/obsolete/pc-mode.el
+++ b/lisp/obsolete/pc-mode.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: emulations
;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index dfa8009..53537a0 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Alon Albert <address@hidden>
-;; Maintainer: address@hidden
;; Created: 1993 Oct 6
;; Keywords: tools, processes
;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index 884cd3e..ba36f2d 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Bob Glickstein <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions
;; Obsolete-since: 24.1
diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el
index 6bd4278..752ebf5 100644
--- a/lisp/obsolete/sup-mouse.el
+++ b/lisp/obsolete/sup-mouse.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
;; Author: Wolfgang Rupprecht
-;; Maintainer: address@hidden
;; Created: 21 Nov 1986
;; Keywords: hardware
;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el
index ce6f230..d0631b3 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Richard Mlynarik <address@hidden>
-;; Maintainer: address@hidden
;; Obsolete-since: 24.4
;; Keywords: comm, terminals
diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el
index 5cbb2ef..eddb3f9 100644
--- a/lisp/obsolete/yow.el
+++ b/lisp/obsolete/yow.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Author: Richard Mlynarik
;; Keywords: games
;; Obsolete-since: 24.4
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 74312bc..9126647 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
;; Author: David O'Toole <address@hidden>
-;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
+;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: hypermedia, outlines, wp
;; This file is part of GNU Emacs.
diff --git a/lisp/outline.el b/lisp/outline.el
index 74df77b..7783d37 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1986, 1993-1995, 1997, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: outlines
;; This file is part of GNU Emacs.
diff --git a/lisp/paren.el b/lisp/paren.el
index 13908d4..d00e7d9 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
;; Author: address@hidden
-;; Maintainer: address@hidden
;; Keywords: languages, faces
;; This file is part of GNU Emacs.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index e461b37..fb310fa 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: games, extensions
;; Created: Mon Mar 22 17:06:26 1993
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index a5880c0..fc76f2b 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: games
;; This file is part of GNU Emacs.
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index b1ab670..e9c78f5 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: games
;; This file is part of GNU Emacs.
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 6d5553b..562e5c0 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Philippe Schnoebelen <address@hidden>
-;; Maintainer: address@hidden
;; Adapted-By: ESR, Daniel Pfeiffer <address@hidden>
;; Keywords: games
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index d762290..1f2e2c0 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -1,7 +1,6 @@
;;; hanoi.el --- towers of hanoi in Emacs
;; Author: Damon Anton Permezel
-;; Maintainer: address@hidden
;; Keywords: games
; Author (a) 1985, Damon Anton Permezel
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 6cce1e5..7d9f147 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
;; Author: Kyle Jones <kyleuunet.uu.net>
-;; Maintainer: address@hidden
;; Keywords: games
;; This file is part of GNU Emacs.
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index d884c0a..c1394a3 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1988, 1993, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: games
;; Created: May 1987
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index ff1bf03..6d54f6d 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -5,7 +5,6 @@
;; This file is part of GNU Emacs.
-;; Maintainer: address@hidden
;; Keywords: games
;;; Commentary:
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index e01f1e8..50f7b4c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -5,7 +5,7 @@
;; Author: Rolf Ebert <address@hidden>
;; Markus Heritsch <address@hidden>
;; Emmanuel Briot <address@hidden>
-;; Maintainer: Stephen Leake <address@hidden>
+;; Maintainer: Stephen Leake <address@hidden>
;; Keywords: languages ada
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index c56d16e..491b780 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1991, 2001-2019 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: tools, languages
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 1a67a95..ff4ea1a 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Alan Mackenzie <address@hidden> (originally based on awk-mode.el)
-;; Maintainer: address@hidden
;; Keywords: AWK, cc-mode, unix, languages
;; Package: cc-mode
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 1a0d9bd..3930f09 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -5,7 +5,6 @@
;; Authors: Roland McGrath <address@hidden>,
;; Daniel Pfeiffer <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: tools, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index ba007d6..fd3eec7 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5,7 +5,6 @@
;; Author: Ilya Zakharevich
;; Bob Olson
;; Jonathan Rockway <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: languages, Perl
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index d5803c7..757f0f2 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Odd Gripenstam <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: DCL editing major-mode languages
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 3faec49..0f44487 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
;; Author: Gerd Moellmann <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: C++ tags tools
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index cb1b17b..d62c131 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: lisp, languages
;; Package: emacs
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 910c320..54ca135 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: Roland McGrath <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: tools
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 716f40c..e09aaa3 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
;; Author: Nick Roberts <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: unix, tools
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 79178c4..d094c95 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Roland McGrath <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: tools, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 4306f5d..f5680f2 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: unix, tools
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index cffb749..c3ff235 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -4,7 +4,6 @@
;; Author: Thomas Neumann <address@hidden>
;; Eric S. Raymond <address@hidden>
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: unix, tools
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index a759709..1dd5d51 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
;; Author: Pieter E.J. Pareit <address@hidden>
-;; Maintainer: address@hidden
;; Created: 09 Nov 2002
;; Version: 0.1
;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer
Programming
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index aa41230..087d1f6 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -2,7 +2,6 @@
;; Author: Michael Schmidt <address@hidden>
;; Tom Perrine <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: languages
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 8a7e24e..4d4e2e1 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -4,7 +4,6 @@
;; Author: Kurt Hornik <address@hidden>
;; John Eaton <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: languages
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 7cbd30a..f01d6b6 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1990, 1994, 2001-2019 Free Software Foundation, Inc.
;; Author: William F. Mann
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: languages
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 2b05735..bd56d1a 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 188bc97..74e865b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6,7 +6,6 @@
;; URL: https://github.com/fgallina/python.el
;; Version: 0.26.1
;; Package-Requires: ((emacs "24.1") (cl-lib "1.0"))
-;; Maintainer: address@hidden
;; Created: Jul 2010
;; Keywords: languages
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 853a350..8f52a36 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -5,7 +5,6 @@
;; Author: Daniel Pfeiffer <address@hidden>
;; Version: 2.0f
-;; Maintainer: address@hidden
;; Keywords: languages, unix
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index ffb3d41..31315e2 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1994, 1998-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Author: Tom Tromey <address@hidden>
;; Chris Lindblad <address@hidden>
;; Keywords: languages tcl modes
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 62c42d3..7ae4712 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1986-1987, 1989-1990, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: languages, lisp
;; This file is part of GNU Emacs.
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index be80b4a..2e75e53 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -9,7 +9,7 @@
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
-;; Author: Kenichi Handa <address@hidden>
+;; Author: Kenichi Handa <address@hidden>
;; (according to ack.texi)
;; Keywords: wp, BDF, font, PostScript
;; Package: ps-print
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 2063133..d248556 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -3,8 +3,8 @@
;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <address@hidden>
-;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
+;; Kenichi Handa <address@hidden> (multi-byte characters)
+;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c88d6d2..537ba96 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -3,8 +3,8 @@
;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <address@hidden>
-;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
+;; Kenichi Handa <address@hidden> (multi-byte characters)
+;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript, multibyte, mule
;; Package: ps-print
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 59ac84a..d0d9cbe 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5,8 +5,8 @@
;; Author: Jim Thompson (was <address@hidden>)
;; Jacques Duthen (was <address@hidden>)
;; Vinicius Jose Latorre <address@hidden>
-;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
+;; Kenichi Handa <address@hidden> (multi-byte characters)
+;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript
;; Version: 7.3.5
@@ -1405,7 +1405,7 @@ Please send all bug fixes and enhancements to
;; prologue code suggestion, for odd/even printing suggestion and for
;; `ps-prologue-file' enhancement.
;;
-;; Thanks to Ken'ichi Handa <address@hidden> for multi-byte buffer handling.
+;; Thanks to Ken'ichi Handa <address@hidden> for multi-byte buffer handling.
;;
;; Thanks to Matthew O Persico <address@hidden> for line number on
;; empty columns.
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 784b435..99c17c7 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -5,8 +5,8 @@
;; Author: Jim Thompson (was <address@hidden>)
;; Jacques Duthen (was <address@hidden>)
;; Vinicius Jose Latorre <address@hidden>
-;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
+;; Kenichi Handa <address@hidden> (multi-byte characters)
+;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/register.el b/lisp/register.el
index 775e1a2..d3825fe 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1993-1994, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/replace.el b/lisp/replace.el
index 9d1b7bf..00b8be5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2019 Free
;; Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 22f9986..0416845 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -4,7 +4,6 @@
;; Author: Michael D. Ernst <address@hidden>
;; Created: Jan 1991
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 8f4044d..bdb2e4b 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
;; Author: Howard Gayle
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/savehist.el b/lisp/savehist.el
index fb3b748..84cba61 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997, 2005-2019 Free Software Foundation, Inc.
;; Author: Hrvoje Niksic <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: minibuffer
;; Version: 24
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 730d31e..960cace 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Karl Fogel <address@hidden>
-;; Maintainer: address@hidden
;; Created: July, 1993
;; Keywords: bookmarks, placeholders
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index dc0df7a..4fc9df8 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: hardware
;; Package: emacs
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 8281edb..7212732 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
;; Author: Ralf Angeli <address@hidden>
-;; Maintainer: address@hidden
;; Created: 2005-06-18
;; This file is part of GNU Emacs.
diff --git a/lisp/select.el b/lisp/select.el
index af6bf46..a8adc16 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/server.el b/lisp/server.el
index 436a44a..f692673 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: William Sommerfeld <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: processes
;; Changes by address@hidden and by rms.
diff --git a/lisp/ses.el b/lisp/ses.el
index 73157d6..7fdacc7 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <address@hidden>
-;; Maintainer: Vincent Belaïche <address@hidden>
+;; Maintainer: Vincent Belaïche <address@hidden>
;; Keywords: spreadsheet Dijkstra
;; This file is part of GNU Emacs.
diff --git a/lisp/shell.el b/lisp/shell.el
index 5357027..6e2ae85 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -5,7 +5,6 @@
;; Author: Olin Shivers <address@hidden>
;; Simon Marshall <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: processes
;; This file is part of GNU Emacs.
diff --git a/lisp/simple.el b/lisp/simple.el
index 4454791..c0e8d58 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985-1987, 1993-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index bce73d6..1d06b64 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions, abbrev, languages, tools
;; This file is part of GNU Emacs.
diff --git a/lisp/sort.el b/lisp/sort.el
index 6ea1c44..86cb180 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Howie Kaye
-;; Maintainer: address@hidden
;; Keywords: unix
;; This file is part of GNU Emacs.
diff --git a/lisp/soundex.el b/lisp/soundex.el
index 1f1f9ca..9e4c797 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
;; Author: Christian Plaunt <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: matching
;; Created: Sat May 15 14:48:18 1993
diff --git a/lisp/startup.el b/lisp/startup.el
index 421a6ea..a88118e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1992, 1994-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 9265b8a..29daaa5 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
;; Author: David Bakhash <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: lisp, mouse, extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/subr.el b/lisp/subr.el
index 05fb9fe..c97d9b9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 14b292d..1f4be16 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -1,7 +1,6 @@
;;; t-mouse.el --- mouse support within the text terminal
;; Author: Nick Roberts <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: mouse gpm linux
;; Copyright (C) 1994-1995, 1998, 2006-2019 Free Software Foundation,
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 37cd8fb..345771e 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Package: emacs
;; This file is part of GNU Emacs.
diff --git a/lisp/talk.el b/lisp/talk.el
index 0b7d5db..b5c77a9 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: comm, frames
;; This file is part of GNU Emacs.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 599da9a..c75fe7c 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1990-1991, 1993-2019 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <address@hidden>
-;; Maintainer: address@hidden
;; Created: 04 Apr 1990
;; Keywords: unix
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index b7a778f..d7fceb8 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: terminals
;; This file is part of GNU Emacs.
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 0927599..c434ea6 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Morten Welinder <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 307586f..2718aec 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
-;; Maintainer: address@hidden
;; Keywords: terminals, faces
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 7a5d3ef..de82232 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -4,7 +4,6 @@
;; Author: Henry Kautz
;; (according to authors.el)
-;; Maintainer: address@hidden
;; Keywords: bib
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index c285491..46dbcfe 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2019 Free
;; Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: wp
;; Package: emacs
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index d18916d..a06f8ed 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Manuel Serrano <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index ff3d242..f351b87 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1991, 1993, 2001-2019 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
-;; Maintainer: address@hidden
;; Keywords: docs convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index f33d4df..e5964d1 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: wp
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 220ef2d..bc92121 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: wp convenience
;; Package: emacs
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 92a6b90..8a1af3a 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: wp
;; Package: emacs
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index b520849..0b50854 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: convenience wp
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 3ba52e6..03b1b04 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
;; Author: Henry Kautz <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: bib, tex
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index f13e1d7..3d4d0d2 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992, 1996, 2001-2019 Free Software Foundation, Inc.
;; Author: Ashwin Ram <address@hidden>
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: bib
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 67ecd3c..efc1108 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2001, 2003-2019 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
-;; Maintainer: address@hidden
;; Created: 29 Mar 1999
;; Version: 2.0
;; Keywords: data memory todo pim
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 1b064fb..1826129 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: James Clark <address@hidden>
-;; Maintainer: address@hidden
;; Adapted-By: ESR, Daniel Pfeiffer <address@hidden>,
;; address@hidden
;; Keywords: wp, hypermedia, comm, languages
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index f27c705..256fac6 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -590,7 +590,7 @@
;; attempt of implementing the table feature to Emacs. This greatly
;; motivated me to follow through to its completion.
;;
-;; Kenichi Handa <address@hidden> kindly guided me through to
+;; Kenichi Handa <address@hidden> kindly guided me through to
;; overcome many technical issues while I was struggling with quail
;; related internationalization problems.
;;
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 9c91d27..8611b73 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2019 Free
;; Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: tex
;; Contributions over the years by William F. Schelter, Dick King,
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 9ccc73a..5a54e0d 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: maint, tex, docs
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 71cdcab..54306d2 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,7 +5,6 @@
;; Author: Robert J. Chassell
;; Date: [See date below for texinfo-version]
-;; Maintainer: address@hidden
;; Keywords: maint, tex, docs
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index e960e99..4f49c7f 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1989-1992, 2001-2019 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
-;; Maintainer: address@hidden
;; Keywords: maint, tex, docs
;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index e676a5d..ac292e4 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1992, 1994, 2001-2019 Free Software Foundation,
;; Inc.
-;; Maintainer: address@hidden
;; Keywords: wp
;; Package: emacs
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index e0bfd24..8c904f5 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: wp
;; This file is part of GNU Emacs.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 60a20e2..e0184a7 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1991-1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Mike Williams <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions, matching, mouse
;; Created: Thu Mar 28 13:48:23 1991
diff --git a/lisp/thread.el b/lisp/thread.el
index e8f3cc7..3242d1d 100644
--- a/lisp/thread.el
+++ b/lisp/thread.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
;; Author: Gemini Lasswell <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: thread, tools
;; This file is part of GNU Emacs.
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 6a17a75..dd0491a 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
;; Author: Jean-Philippe Theberge <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: Multimedia
;; This file is part of GNU Emacs.
diff --git a/lisp/time.el b/lisp/time.el
index 35157c5..c2f60d3 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -3,8 +3,6 @@
;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 44f04ea..bb96b5a 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-1996, 2000-2019 Free Software Foundation, Inc.
;; Author: Ilya Zakharevich <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 37ebb5c..e428182 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: help, internal
;; Package: emacs
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 3dd9e34..29612b3 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Dick King <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: files
;; Created: 15 May 86
;; Package: emacs
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index a4cf0f0..dba3134 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
;; Author: Bill Perry <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: url, vc
;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 5436084..00d784a 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997-1998, 2004-2019 Free Software Foundation, Inc.
;; Author: Bill Perry <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, data, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 00803a1..a11f514 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999, 2001, 2004-2019 Free Software Foundation, Inc.
;; Author: Bill Perry <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, data, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index a46e7bb..dbcc9a6 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Perry <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, data, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 5242d42..eafac8a 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Perry <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: comm, data, processes, hypermedia
;; This file is part of GNU Emacs.
diff --git a/lisp/userlock.el b/lisp/userlock.el
index f077bc9..c4178ac 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -4,7 +4,6 @@
;; Author: Richard King
;; (according to authors.el)
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index f9efd44..5cd4f46 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2019 Free
;; Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 02c08af..2811d46 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: convenience files vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 523be87..bee3659 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -5,7 +5,6 @@
;; Author: Frank Bresz
;; (according to authors.el)
-;; Maintainer: address@hidden
;; Keywords: unix, vc, tools
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 8483813..15f234f 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
;; Author: Martin Lorentzson <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; Package: vc
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index ee1646c..3ab8c49 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -4,7 +4,6 @@
;; Author: Dave Love <address@hidden>
;; Riccardo Murri <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; Created: Sept 2006
;; Package: vc
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 626e190..cc1845a 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1998-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index c4b327a..579448b 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
;; Author: FSF (see below for full credits)
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; Package: vc
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index f05e8ef..37c71f9 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 876d824..f1b603b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
;; Author: Ivan Kanis
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; Package: vc
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 07b3d86..1871e1e 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 598e982..ee227b1 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 4e9f5a0..0d27528 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index f847592..b708cd4 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
-;; Maintainer: address@hidden
;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b992a8e..d9fb829 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc.
;; Author: FSF (see below for full credits)
-;; Maintainer: address@hidden
;; Keywords: vc tools
;; This file is part of GNU Emacs.
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 3e8b6ee..7673d9b 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Peter Stephenson <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: virtual cursor, convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/version.el b/lisp/version.el
index d13d8c3..d5bc3eb 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1992, 1994-1995, 1999-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/view.el b/lisp/view.el
index e74ce1e..c8d5f0d 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: K. Shane Hartman
-;; Maintainer: address@hidden
;; Keywords: files
;; This file is part of GNU Emacs.
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index d7b5f0a..6678f49 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
;; Author: Howard Gayle
-;; Maintainer: address@hidden
;; Keywords: hardware
;; This file is part of GNU Emacs.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b9f98cd..713c857 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: extensions
;; Package: emacs
diff --git a/lisp/window.el b/lisp/window.el
index 2c9d177..7e6a484 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1985, 1989, 1992-1994, 2000-2019 Free Software
;; Foundation, Inc.
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/woman.el b/lisp/woman.el
index 39d9b80..5735447 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Francis J. Wright <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: help, unix
;; Adapted-By: Eli Zaretskii <address@hidden>
;; Version: 0.551
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index e4e2dec..31d409c 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
;; Author: Jan Djärv <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: window, drag, drop
;; Package: emacs
diff --git a/src/xterm.c b/src/xterm.c
index bff9f74..559d1b4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8191,7 +8191,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
fit in 81 bytes. So, we must prepare sufficient
bytes for copy_buffer. 513 bytes (256 chars for
two-byte character set) seems to be a fairly good
- approximation. -- 2000.8.10 address@hidden */
+ approximation. -- 2000.8.10 address@hidden */
unsigned char copy_buffer[513];
unsigned char *copy_bufptr = copy_buffer;
int copy_bufsiz = sizeof (copy_buffer);
diff --git a/test/lisp/emacs-lisp/map-tests.el
b/test/lisp/emacs-lisp/map-tests.el
index a54af80..5e044d4 100644
--- a/test/lisp/emacs-lisp/map-tests.el
+++ b/test/lisp/emacs-lisp/map-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
;; Author: Nicolas Petton <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/seq-tests.el
b/test/lisp/emacs-lisp/seq-tests.el
index ef05e2b..8f66ba4 100644
--- a/test/lisp/emacs-lisp/seq-tests.el
+++ b/test/lisp/emacs-lisp/seq-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
;; Author: Nicolas Petton <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/thunk-tests.el
b/test/lisp/emacs-lisp/thunk-tests.el
index caa2c41..69bfc19 100644
--- a/test/lisp/emacs-lisp/thunk-tests.el
+++ b/test/lisp/emacs-lisp/thunk-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
;; Author: Nicolas Petton <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index e31ac6a..2e94830 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/md4-tests.el b/test/lisp/md4-tests.el
index 9712411..56b09c1 100644
--- a/test/lisp/md4-tests.el
+++ b/test/lisp/md4-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
;; Author: Mark Oteiza <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el
index 4b82aa8..33f9e45 100644
--- a/test/lisp/org/org-tests.el
+++ b/test/lisp/org/org-tests.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/soundex-tests.el b/test/lisp/soundex-tests.el
index d8d79b8..4de45f9 100644
--- a/test/lisp/soundex-tests.el
+++ b/test/lisp/soundex-tests.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index 676d461..d809b64 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -1,7 +1,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
;; Author: Dima Kogan <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/vc/smerge-mode-tests.el
b/test/lisp/vc/smerge-mode-tests.el
index 032afa9..67f6468 100644
--- a/test/lisp/vc/smerge-mode-tests.el
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -1,7 +1,5 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 8fa16cd..04c869e 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
;; Author: Glenn Morris <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el
index 1bdc320..7fc8461 100644
--- a/test/lisp/vc/vc-hg-tests.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
;; Author: Dmitry Gutov <address@hidden>
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el
index 9c81506..b8bd606 100644
--- a/test/lisp/xdg-tests.el
+++ b/test/lisp/xdg-tests.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; Author: Mark Oteiza <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index d813642..f257910 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
-;; Maintainer: address@hidden
;; Package: emacs
;; This program is free software: you can redistribute it and/or modify
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 250aeb1..30ad340 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: Roland McGrath <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: tools
;; This file is part of GNU Emacs.
diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el
index f1d1110..d92ebcb 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -2,8 +2,6 @@
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master bef1be8: Fixes for "Maintainer:" and related lines,
Paul Eggert <=