>From a049585f499c1654feb6b3f1f67972840b1bd9fe Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Sun, 19 May 2019 09:29:55 -0700
Subject: [PATCH] Remove "Maintainer:" comments
---
.gitlab-ci.yml | 1 -
admin/authors.el | 2 --
admin/cus-test.el | 1 -
admin/find-gc.el | 2 --
admin/grammars/grammar.wy | 1 -
admin/grammars/java-tags.wy | 1 -
admin/grammars/python.wy | 1 -
admin/last-chance.el | 1 -
autogen.sh | 1 -
build-aux/make-info-dir | 1 -
doc/lispref/tips.texi | 1 -
etc/edt-user.el | 1 -
leim/SKK-DIC/SKK-JISYO.L | 1 -
lisp/abbrev.el | 1 -
lisp/align.el | 1 -
lisp/allout-widgets.el | 1 -
lisp/allout.el | 1 -
lisp/ansi-color.el | 1 -
lisp/array.el | 1 -
lisp/autoinsert.el | 1 -
lisp/bindings.el | 1 -
lisp/bookmark.el | 1 -
lisp/bs.el | 1 -
lisp/buff-menu.el | 1 -
lisp/calendar/appt.el | 1 -
lisp/calendar/cal-china.el | 1 -
lisp/calendar/cal-coptic.el | 1 -
lisp/calendar/cal-dst.el | 1 -
lisp/calendar/cal-french.el | 1 -
lisp/calendar/cal-hebrew.el | 1 -
lisp/calendar/cal-islam.el | 1 -
lisp/calendar/cal-iso.el | 1 -
lisp/calendar/cal-julian.el | 1 -
lisp/calendar/cal-mayan.el | 1 -
lisp/calendar/cal-menu.el | 1 -
lisp/calendar/cal-move.el | 1 -
lisp/calendar/cal-persia.el | 1 -
lisp/calendar/cal-tex.el | 1 -
lisp/calendar/cal-x.el | 1 -
lisp/calendar/calendar.el | 1 -
lisp/calendar/diary-lib.el | 1 -
lisp/calendar/holidays.el | 1 -
lisp/calendar/lunar.el | 1 -
lisp/calendar/solar.el | 1 -
lisp/calendar/todo-mode.el | 1 -
lisp/case-table.el | 1 -
lisp/cdl.el | 1 -
lisp/cedet/cedet.el | 1 -
lisp/cedet/mode-local.el | 1 -
lisp/cedet/semantic/bovine/grammar.el | 1 -
lisp/cedet/semantic/grammar.el | 1 -
lisp/cedet/semantic/imenu.el | 1 -
lisp/cedet/semantic/senator.el | 1 -
lisp/cedet/semantic/wisent.el | 1 -
lisp/cedet/semantic/wisent/comp.el | 1 -
lisp/cedet/semantic/wisent/grammar.el | 1 -
lisp/cedet/semantic/wisent/java-tags.el | 1 -
lisp/cedet/semantic/wisent/python.el | 1 -
lisp/cedet/semantic/wisent/wisent.el | 1 -
lisp/char-fold.el | 1 -
lisp/chistory.el | 1 -
lisp/cmuscheme.el | 1 -
lisp/comint.el | 1 -
lisp/completion.el | 1 -
lisp/cus-edit.el | 1 -
lisp/cus-theme.el | 1 -
lisp/custom.el | 1 -
lisp/dabbrev.el | 1 -
lisp/delim-col.el | 1 -
lisp/delsel.el | 1 -
lisp/descr-text.el | 1 -
lisp/dired-aux.el | 1 -
lisp/dired-x.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/doc-view.el | 1 -
lisp/dos-fns.el | 1 -
lisp/dos-vars.el | 1 -
lisp/dos-w32.el | 1 -
lisp/dynamic-setting.el | 1 -
lisp/ebuff-menu.el | 1 -
lisp/echistory.el | 1 -
lisp/edmacro.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/easy-mmode.el | 1 -
lisp/emacs-lisp/edebug.el | 1 -
lisp/emacs-lisp/eldoc.el | 1 -
lisp/emacs-lisp/elp.el | 1 -
lisp/emacs-lisp/ewoc.el | 1 -
lisp/emacs-lisp/find-func.el | 1 -
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/regi.el | 1 -
lisp/emacs-lisp/ring.el | 1 -
lisp/emacs-lisp/rmc.el | 1 -
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 | 1 -
lisp/emacs-lisp/tcover-unsafep.el | 1 -
lisp/emacs-lisp/testcover.el | 1 -
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/unsafep.el | 1 -
lisp/emacs-lisp/warnings.el | 1 -
lisp/emacs-lock.el | 1 -
lisp/emulation/edt-lk201.el | 1 -
lisp/emulation/edt-mapper.el | 1 -
lisp/emulation/edt-pc.el | 1 -
lisp/emulation/edt-vt100.el | 1 -
lisp/emulation/edt.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/gnus/gnus-diary.el | 1 -
lisp/gnus/nndiary.el | 1 -
lisp/gnus/spam.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/hfy-cmap.el | 1 -
lisp/hippie-exp.el | 1 -
lisp/hl-line.el | 1 -
lisp/htmlfontify.el | 1 -
lisp/ibuf-ext.el | 1 -
lisp/ibuf-macs.el | 1 -
lisp/ibuffer.el | 1 -
lisp/icomplete.el | 1 -
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 | 1 -
lisp/international/iso-ascii.el | 1 -
lisp/international/iso-transl.el | 1 -
lisp/international/ogonek.el | 1 -
lisp/international/quail.el | 1 -
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/jsonrpc.el | 1 -
lisp/kermit.el | 1 -
lisp/language/czech.el | 1 -
lisp/language/european.el | 1 -
lisp/language/ind-util.el | 1 -
lisp/language/indian.el | 1 -
lisp/language/slovak.el | 1 -
lisp/leim/quail/czech.el | 1 -
lisp/leim/quail/latin-pre.el | 1 -
lisp/leim/quail/sami.el | 1 -
lisp/leim/quail/slovak.el | 1 -
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/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/mspools.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/smtpmail.el | 2 --
lisp/mail/supercite.el | 1 -
lisp/mail/undigest.el | 1 -
lisp/mail/unrmail.el | 1 -
lisp/makesum.el | 1 -
lisp/man.el | 1 -
lisp/master.el | 1 -
lisp/menu-bar.el | 1 -
lisp/mh-e/mh-acros.el | 1 -
lisp/mh-e/mh-alias.el | 1 -
lisp/mh-e/mh-buffers.el | 1 -
lisp/mh-e/mh-comp.el | 1 -
lisp/mh-e/mh-compat.el | 1 -
lisp/mh-e/mh-e.el | 1 -
lisp/mh-e/mh-folder.el | 1 -
lisp/mh-e/mh-funcs.el | 1 -
lisp/mh-e/mh-gnus.el | 1 -
lisp/mh-e/mh-identity.el | 1 -
lisp/mh-e/mh-inc.el | 1 -
lisp/mh-e/mh-junk.el | 1 -
lisp/mh-e/mh-letter.el | 1 -
lisp/mh-e/mh-limit.el | 1 -
lisp/mh-e/mh-mime.el | 1 -
lisp/mh-e/mh-print.el | 1 -
lisp/mh-e/mh-scan.el | 1 -
lisp/mh-e/mh-search.el | 1 -
lisp/mh-e/mh-seq.el | 1 -
lisp/mh-e/mh-show.el | 1 -
lisp/mh-e/mh-speed.el | 1 -
lisp/mh-e/mh-thread.el | 1 -
lisp/mh-e/mh-tool-bar.el | 1 -
lisp/mh-e/mh-utils.el | 1 -
lisp/mh-e/mh-xface.el | 1 -
lisp/midnight.el | 1 -
lisp/misc.el | 1 -
lisp/mouse.el | 1 -
lisp/msb.el | 1 -
lisp/mwheel.el | 1 -
lisp/net/ange-ftp.el | 1 -
lisp/net/browse-url.el | 1 -
lisp/net/eudc-bob.el | 1 -
lisp/net/eudc-export.el | 1 -
lisp/net/eudc-hotlist.el | 1 -
lisp/net/eudc-vars.el | 1 -
lisp/net/eudc.el | 1 -
lisp/net/eudcb-bbdb.el | 1 -
lisp/net/eudcb-ldap.el | 1 -
lisp/net/eudcb-mab.el | 1 -
lisp/net/goto-addr.el | 1 -
lisp/net/ldap.el | 1 -
lisp/net/ntlm.el | 1 -
lisp/net/pop3.el | 1 -
lisp/net/quickurl.el | 1 -
lisp/net/rlogin.el | 1 -
lisp/net/telnet.el | 1 -
lisp/net/tramp-cache.el | 1 -
lisp/net/tramp-sh.el | 1 -
lisp/net/tramp-uu.el | 1 -
lisp/net/tramp.el | 1 -
lisp/net/trampver.el | 1 -
lisp/newcomment.el | 1 -
lisp/novice.el | 1 -
lisp/obarray.el | 1 -
lisp/obsolete/abbrevlist.el | 1 -
lisp/obsolete/bruce.el | 1 -
lisp/obsolete/cc-compat.el | 1 -
lisp/obsolete/eudcb-ph.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/iswitchb.el | 1 -
lisp/obsolete/lazy-lock.el | 1 -
lisp/obsolete/ledit.el | 1 -
lisp/obsolete/levents.el | 1 -
lisp/obsolete/longlines.el | 1 -
lisp/obsolete/lucid.el | 1 -
lisp/obsolete/mailpost.el | 1 -
lisp/obsolete/meese.el | 1 -
lisp/obsolete/otodo-mode.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/tpu-edt.el | 1 -
lisp/obsolete/tpu-extras.el | 1 -
lisp/obsolete/tpu-mapper.el | 1 -
lisp/obsolete/vc-arch.el | 1 -
lisp/obsolete/yow.el | 1 -
lisp/org/org-crypt.el | 1 -
lisp/org/org-mouse.el | 1 -
lisp/org/org-protocol.el | 1 -
lisp/org/org.el | 1 -
lisp/org/ox-publish.el | 1 -
lisp/outline.el | 1 -
lisp/paren.el | 1 -
lisp/play/5x5.el | 1 -
lisp/play/animate.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/play/zone.el | 1 -
lisp/printing.el | 1 -
lisp/progmodes/ada-mode.el | 1 -
lisp/progmodes/ada-prj.el | 1 -
lisp/progmodes/ada-stmt.el | 1 -
lisp/progmodes/ada-xref.el | 1 -
lisp/progmodes/asm-mode.el | 1 -
lisp/progmodes/cc-align.el | 1 -
lisp/progmodes/cc-awk.el | 1 -
lisp/progmodes/cc-bytecomp.el | 1 -
lisp/progmodes/cc-cmds.el | 1 -
lisp/progmodes/cc-defs.el | 1 -
lisp/progmodes/cc-engine.el | 1 -
lisp/progmodes/cc-fonts.el | 3 +--
lisp/progmodes/cc-guess.el | 1 -
lisp/progmodes/cc-langs.el | 1 -
lisp/progmodes/cc-menus.el | 1 -
lisp/progmodes/cc-mode.el | 3 +--
lisp/progmodes/cc-styles.el | 1 -
lisp/progmodes/cc-vars.el | 1 -
lisp/progmodes/cfengine.el | 1 -
lisp/progmodes/compile.el | 1 -
lisp/progmodes/cperl-mode.el | 1 -
lisp/progmodes/dcl-mode.el | 1 -
lisp/progmodes/ebnf-abn.el | 1 -
lisp/progmodes/ebnf-bnf.el | 1 -
lisp/progmodes/ebnf-dtd.el | 1 -
lisp/progmodes/ebnf-ebx.el | 1 -
lisp/progmodes/ebnf-iso.el | 1 -
lisp/progmodes/ebnf-otz.el | 1 -
lisp/progmodes/ebnf-yac.el | 1 -
lisp/progmodes/ebnf2ps.el | 1 -
lisp/progmodes/ebrowse.el | 1 -
lisp/progmodes/elisp-mode.el | 1 -
lisp/progmodes/etags.el | 1 -
lisp/progmodes/f90.el | 1 -
lisp/progmodes/flymake-proc.el | 1 -
lisp/progmodes/flymake.el | 1 -
lisp/progmodes/fortran.el | 1 -
lisp/progmodes/gdb-mi.el | 1 -
lisp/progmodes/glasses.el | 1 -
lisp/progmodes/grep.el | 1 -
lisp/progmodes/gud.el | 1 -
lisp/progmodes/hideif.el | 1 -
lisp/progmodes/idlw-complete-structtag.el | 1 -
lisp/progmodes/idlw-help.el | 1 -
lisp/progmodes/idlw-shell.el | 1 -
lisp/progmodes/idlw-toolbar.el | 1 -
lisp/progmodes/idlwave.el | 1 -
lisp/progmodes/js.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/opascal.el | 1 -
lisp/progmodes/perl-mode.el | 1 -
lisp/progmodes/prog-mode.el | 1 -
lisp/progmodes/prolog.el | 1 -
lisp/progmodes/ps-mode.el | 1 -
lisp/progmodes/python.el | 1 -
lisp/progmodes/sh-script.el | 1 -
lisp/progmodes/simula.el | 1 -
lisp/progmodes/sql.el | 1 -
lisp/progmodes/tcl.el | 1 -
lisp/progmodes/vera-mode.el | 1 -
lisp/progmodes/vhdl-mode.el | 1 -
lisp/progmodes/xscheme.el | 1 -
lisp/ps-def.el | 1 -
lisp/ps-mule.el | 1 -
lisp/ps-print.el | 1 -
lisp/ps-samp.el | 1 -
lisp/rect.el | 1 -
lisp/register.el | 1 -
lisp/replace.el | 1 -
lisp/reposition.el | 1 -
lisp/rot13.el | 1 -
lisp/ruler-mode.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 | 1 -
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.el | 1 -
lisp/term/common-win.el | 1 -
lisp/term/pc-win.el | 1 -
lisp/term/tty-colors.el | 1 -
lisp/textmodes/artist.el | 1 -
lisp/textmodes/bib-mode.el | 1 -
lisp/textmodes/bibtex.el | 1 -
lisp/textmodes/css-mode.el | 1 -
lisp/textmodes/fill.el | 1 -
lisp/textmodes/flyspell.el | 1 -
lisp/textmodes/less-css-mode.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/refill.el | 1 -
lisp/textmodes/reftex-auc.el | 1 -
lisp/textmodes/reftex-cite.el | 1 -
lisp/textmodes/reftex-dcr.el | 1 -
lisp/textmodes/reftex-global.el | 1 -
lisp/textmodes/reftex-index.el | 1 -
lisp/textmodes/reftex-parse.el | 1 -
lisp/textmodes/reftex-ref.el | 1 -
lisp/textmodes/reftex-sel.el | 1 -
lisp/textmodes/reftex-toc.el | 1 -
lisp/textmodes/reftex-vars.el | 1 -
lisp/textmodes/reftex.el | 1 -
lisp/textmodes/remember.el | 1 -
lisp/textmodes/rst.el | 1 -
lisp/textmodes/sgml-mode.el | 1 -
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-stamp.el | 1 -
lisp/time.el | 1 -
lisp/timezone.el | 1 -
lisp/tmm.el | 1 -
lisp/tree-widget.el | 1 -
lisp/tutorial.el | 1 -
lisp/type-break.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/pcvs.el | 1 -
lisp/vc/vc-annotate.el | 1 -
lisp/vc/vc-bzr.el | 1 -
lisp/vc/vc-cvs.el | 1 -
lisp/vc/vc-dav.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-svn.el | 1 -
lisp/vc/vc.el | 1 -
lisp/vcursor.el | 1 -
lisp/version.el | 1 -
lisp/view.el | 1 -
lisp/vt-control.el | 1 -
lisp/vt100-led.el | 1 -
lisp/whitespace.el | 1 -
lisp/wid-edit.el | 1 -
lisp/window.el | 1 -
lisp/woman.el | 1 -
lisp/x-dnd.el | 1 -
lisp/xml.el | 1 -
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 | 1 -
test/lisp/jsonrpc-tests.el | 1 -
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 --
558 files changed, 2 insertions(+), 574 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92efcf6497..4434e8070e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,6 @@
# any particular service that uses that protocol. Also, it is intended for
# evaluation purposes, thus possibly temporary.
-# Maintainer: address@hidden
# URL: https://emba.gnu.org/emacs/emacs
image: debian:stretch
diff --git a/admin/authors.el b/admin/authors.el
index a3f8bdde84..8329f3f581 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
-;; Maintainer: address@hidden
;; Keywords: maint
;; Package: emacs
diff --git a/admin/cus-test.el b/admin/cus-test.el
index f9fd53d98e..b0ce60785d 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1998, 2000, 2002-2019 Free Software Foundation, Inc.
;; Author: Markus Rost
-;; Maintainer: Markus Rost
;; Created: 13 Sep 1998
;; Keywords: maint
diff --git a/admin/find-gc.el b/admin/find-gc.el
index bf93c4eedf..9b925565df 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/grammars/grammar.wy b/admin/grammars/grammar.wy
index f7664de655..5b06917d7d 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;;
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 26 Aug 2002
;; Keywords: syntax
;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 88beafeddb..db4f61c5b0 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;;
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 26 Aug 2002
;; Keywords: syntax
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 5e5bdc194c..695e612942 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -5,7 +5,6 @@
;; 2009, 2010 Python Software Foundation; All Rights Reserved
;; Author: Richard Kim
-;; Maintainer: Richard Kim
;; Created: June 2002
;; Keywords: syntax
;;
diff --git a/admin/last-chance.el b/admin/last-chance.el
index 5f993be18e..ceed1c7cfa 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
-;; Maintainer: address@hidden
;; Keywords: maint
;; Package: emacs
diff --git a/autogen.sh b/autogen.sh
index 40d0c37b11..f390b1a777 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,6 @@
## Copyright (C) 2011-2019 Free Software Foundation, Inc.
## Author: Glenn Morris
-## 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 2dcac87b48..51f384aff8 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
-## Maintainer: address@hidden
## This file is part of GNU Emacs.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index d41fe82572..fb9c19e334 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -951,7 +951,6 @@ Library Headers
@end group
;; Author: Your Name
-;; Maintainer: Someone Else
;; Created: 14 Jul 2010
@group
;; Keywords: languages
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 5aede6bfd8..10ea4c458b 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; This file is part of GNU Emacs.
diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L
index 6b024e3dc4..082c2bd1ba 100644
--- a/leim/SKK-DIC/SKK-JISYO.L
+++ b/leim/SKK-DIC/SKK-JISYO.L
@@ -12,7 +12,6 @@
;; MITA Yuusuke
;; SKK Development Team
;;
-;; Maintainer: SKK Development Team
;; Keywords: japanese
;;
;; This dictionary is free software; you can redistribute it and/or
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3c88ec661a..be19da525e 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 443237b451..aeb845a561 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: John Wiegley
-;; Maintainer: address@hidden
;; Keywords: convenience languages lisp
;; This file is part of GNU Emacs.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 67fce325ff..e6615d983e 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
;; Author: Ken Manheimer
-;; Maintainer: Ken Manheimer
;; Version: 1.0
;; Created: Dec 2005
;; Keywords: outlines
diff --git a/lisp/allout.el b/lisp/allout.el
index b3b87e533b..12a67cdb02 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1992-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Ken Manheimer
-;; Maintainer: Ken Manheimer
;; Created: Dec 1991 -- first release to usenet
;; Version: 2.3
;; Keywords: outlines, wp, languages, PGP, GnuPG
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 136e69f9a7..fe8cadacda 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder
-;; Maintainer: Alex Schroeder
;; Version: 3.4.2
;; Keywords: comm processes terminals services
diff --git a/lisp/array.el b/lisp/array.el
index 2fffe0197e..28635d18af 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 f7ecfe27bb..c2ebea7008 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -6,7 +6,6 @@
;; Author: Charlie Martin
;; Adapted-By: Daniel Pfeiffer
;; Keywords: convenience
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 744bcc36a8..4f09d583d7 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/bookmark.el b/lisp/bookmark.el
index 3041401e17..b1fe690dac 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Karl Fogel
-;; Maintainer: Karl Fogel
;; Created: July, 1993
;; Keywords: bookmarks, placeholders, annotations
diff --git a/lisp/bs.el b/lisp/bs.el
index 86a19fddcc..47782d7192 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
;; Author: Olaf Sylvester
-;; 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 5f88986636..c8cd25caff 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/calendar/appt.el b/lisp/calendar/appt.el
index 40cb9f7cbd..2e0e35e0bc 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Neil Mager
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Package: calendar
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index f92947ed28..2d59474479 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Chinese calendar, calendar, holidays, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 6fa460625c..4d0986e8c4 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Coptic calendar, Ethiopic calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 2126cfdadb..176e45ec8d 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -4,7 +4,6 @@
;; Author: Paul Eggert
;; Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: daylight saving time, calendar, diary, holidays
;; Package: calendar
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b9abab5ffa..7103a4c9ce 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: French Revolutionary calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index b26dbbebda..62e345fd3a 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -4,7 +4,6 @@
;; Author: Nachum Dershowitz
;; Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Hebrew calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 32e15f538d..deecbbf007 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Islamic calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 8568afeb05..e8a7bc8acc 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: ISO calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 1297a96bf9..b8694661aa 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Julian calendar, Julian day number, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 37fe4b9a2e..d35bad90e9 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -5,7 +5,6 @@
;; Author: Stewart M. Clamen
;; Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Mayan calendar, Maya, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index cf7d04fbb4..e810e79e23 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -4,7 +4,6 @@
;; Author: Edward M. Reingold
;; Lara Rios
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: calendar, popup menus, menu bar
;; Package: calendar
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index ecd05e7e49..03fa0efa9d 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: calendar
;; Package: calendar
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index c0b6cb23cf..93045ce970 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Persian calendar, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 78ab076595..648ac09b03 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -4,7 +4,6 @@
;; Author: Steve Fisk
;; Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: Calendar, LaTeX
;; Package: calendar
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 58d1eeb60e..f452431756 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -4,7 +4,6 @@
;; Author: Michael Kifer
;; Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: calendar, dedicated frames
;; Package: calendar
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index de8f758fae..a842f5f674 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: calendar, Gregorian calendar, diary, holidays
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 1be2a05eee..bcadf2e316 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; This file is part of GNU Emacs.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 2b080c3073..71f302649c 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: holidays, calendar
;; Package: calendar
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 5424551e24..92a49c429d 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Edward M. Reingold
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: moon, lunar phases, calendar, diary
;; Package: calendar
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 23bc7611e5..bbcaee9339 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -5,7 +5,6 @@
;; Author: Edward M. Reingold
;; Denis B. Roegel
-;; Maintainer: Glenn Morris
;; Keywords: calendar
;; Human-Keywords: sunrise, sunset, equinox, solstice, calendar, diary, holidays
;; Package: calendar
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 7169ef41ae..b029ca6765 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -4,7 +4,6 @@
;; Author: Oliver Seidel
;; Stephen Berman
-;; Maintainer: Stephen Berman
;; Keywords: calendar, todo
;; This file is part of GNU Emacs.
diff --git a/lisp/case-table.el b/lisp/case-table.el
index c27e772b04..7474d63323 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 752e59b5d4..36f72ef051 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
-;; 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 b3d4a5def2..c67f0db41d 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: Eric M. Ludlam
;; Version: 2.0
;; Keywords: OO, lisp
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index f83decbc01..fe87d1ae4b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2005, 2007-2019 Free Software Foundation, Inc.
;;
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 27 Apr 2004
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index f77bc9db55..7c25b79db8 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;;
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 26 Aug 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f6d67cf48e..7fb54cbb89 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2005, 2007-2019 Free Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: David Ponce
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 0fb9eca753..027c9891cd 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Eric M. Ludlam
-;; Maintainer: Eric Ludlam
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 2462662bbd..79bb4b20ee 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
-;; Maintainer: address@hidden
;; Created: 10 Nov 2000
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 6bb771054d..122b5d399c 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2007, 2009-2019 Free Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 30 Aug 2001
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index db910b1424..051b898ed7 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 30 January 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/grammar.el b/lisp/cedet/semantic/wisent/grammar.el
index 7d776712eb..d23e293552 100644
--- a/lisp/cedet/semantic/wisent/grammar.el
+++ b/lisp/cedet/semantic/wisent/grammar.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;;
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 26 Aug 2002
;; Keywords: syntax
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index 4bf7a8e2af..87c3090bdb 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2001-2006, 2009-2019 Free Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 15 Dec 2001
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index c530329bae..d505b03f2e 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
;; Author: Richard Kim
-;; Maintainer: Richard Kim
;; Created: June 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index 21082429a2..401b404fee 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -3,7 +3,6 @@
;;; Copyright (C) 2002-2007, 2009-2019 Free Software Foundation, Inc.
;; Author: David Ponce
-;; Maintainer: David Ponce
;; Created: 30 January 2002
;; Keywords: syntax
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3edc6..426b1a9f84 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 59bdc00c67..9c29bb7c43 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 ed6f1bfb1a..f949a8c109 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Olin Shivers
-;; Maintainer: address@hidden
;; Keywords: processes, lisp
;; This file is part of GNU Emacs.
diff --git a/lisp/comint.el b/lisp/comint.el
index d21cc1378f..3939371ab8 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4,7 +4,6 @@
;; Author: Olin Shivers
;; Simon Marshall
-;; Maintainer: address@hidden
;; Keywords: processes
;; Package: emacs
diff --git a/lisp/completion.el b/lisp/completion.el
index 89285c74d4..ff392dd821 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 of Thinking Machines Inc.
;; (ideas suggested by Brewster Kahle)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index f87b6b621c..87f12aa89c 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
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index bc9d1d4f7d..9846aa8d99 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
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/custom.el b/lisp/custom.el
index 29bf9e570a..e2bf8718b6 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -4,7 +4,6 @@
;; Inc.
;;
;; Author: Per Abrahamsen
-;; Maintainer: address@hidden
;; Keywords: help, faces
;; Package: emacs
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 2159f96028..f1fae18e74 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/delim-col.el b/lisp/delim-col.el
index a968b32052..f33248acd7 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre
-;; Maintainer: Vinicius Jose Latorre
;; Version: 2.1
;; Keywords: internal
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 8f71bc6519..a815b91c01 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Matthieu Devin
-;; Maintainer: address@hidden
;; Created: 14 Jul 92
;; Keywords: convenience emulations
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 8be2b94458..2976b788f0 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
-;; 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 aae521287e..305cfd4f32 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Sebastian Kremer .
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 3b78ec47d9..948c76a8c9 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -5,7 +5,6 @@
;; Author: Sebastian Kremer
;; Lawrence R. Dodd
-;; Maintainer: Romain Francoise
;; Keywords: dired extensions files
;; Package: emacs
diff --git a/lisp/dired.el b/lisp/dired.el
index ea1943de1d..f137d4a5be 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Sebastian Kremer
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 4a59750677..f1676bbfa3 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -5,7 +5,6 @@
;; Author: Erik Naggum
;; 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 6d5f5a9f89..ec89adea21 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 d38f2e6963..ac01112215 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 459a7238dc..82bb7c9ef8 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
-;; Maintainer: address@hidden
;; Keywords: window, drag, drop
;; Package: emacs
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index a706907260..7ab8539052 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
;;
;; Author: Tassilo Horn
-;; Maintainer: Tassilo Horn
;; Keywords: files, pdf, ps, dvi
;; This file is part of GNU Emacs.
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index c575dd413f..bffd54006d 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 53de20b853..0bf10133c2 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/dos-w32.el b/lisp/dos-w32.el
index 0c04b8fa7f..08ac4eab43 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -2,7 +2,6 @@
;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
-;; Maintainer: Geoff Voelker
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index cf1a8d3b73..ea530f991a 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
-;; 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 6543e5f197..ddfad25a38 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Richard Mlynarik
-;; Maintainer: address@hidden
;; Keywords: convenience
;; This file is part of GNU Emacs.
diff --git a/lisp/echistory.el b/lisp/echistory.el
index e932daf2f0..8006d7bcd9 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/edmacro.el b/lisp/edmacro.el
index b480b2330a..da3e782bd9 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Dave Gillespie
-;; Maintainer: Dave Gillespie
;; Version: 2.01
;; Keywords: abbrev
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 2a24c9857c..8fc8e1f15a 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 07da2f1d9e..1f4c132f92 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 2034f33d0e..dfd6d2e5b8 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
-;; 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 d2a3a131d1..a1739562f6 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -6,7 +6,6 @@
;; Inge Wallin
;; Thomas Bellman
;; Toby Cubitt
-;; 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 5e72dc3b40..344a0ba8f6 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Rick Sladkey
-;; 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 44cca6136c..02a9749f47 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -4,7 +4,6 @@
;; Author: Jamie Zawinski
;; Hallvard Furuseth
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 842d1d48b4..811b485dc6 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -4,7 +4,6 @@
;; Author: Jamie Zawinski
;; Hallvard Furuseth
-;; Maintainer: address@hidden
;; Keywords: internal
;; Package: emacs
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e76baf5ed0..95e287c806 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5,7 +5,6 @@
;; Author: Jamie Zawinski
;; Hallvard Furuseth
-;; Maintainer: address@hidden
;; Keywords: lisp
;; Package: emacs
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 58ca9d5f57..21af4b6e63 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
-;; Maintainer: address@hidden
;; Keywords: lisp
;; Package: emacs
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 10af440008..ea6efbf851 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -4,7 +4,6 @@
;; Author: Richard Mlynarik
;; 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 8989aa0719..259f240d29 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 6db0584b98..9f7beeaef5 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 3fc22247fa..ed3c1fbaa9 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -4,7 +4,6 @@
;; Author: Doug Cutting
;; Jamie Zawinski
-;; Maintainer: address@hidden
;; Keywords: internal
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index be531aab84..dbc2ccdec9 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
;; Author: Georges Brun-Cottan
-;; Maintainer: Stefan Monnier
;; Package: emacs
;; Keywords: extensions lisp
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ab5553b4e8..b8da76ccf0 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Daniel LaLiberte
-;; 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 188d99e14c..16b5863209 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
;; Author: Noah Friedman
-;; Maintainer: address@hidden
;; Keywords: extensions
;; Created: 1995-10-06
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index f0dcb51af8..1f8d31a3fc 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 c33b46501f..da8d2921dc 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -4,7 +4,6 @@
;; Author: Per Cederqvist
;; Inge Wallin
-;; Maintainer: address@hidden
;; Created: 3 Aug 1992
;; Keywords: extensions, lisp
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index b63d4d4e0a..9fc7e4a797 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
;; Author: Jens Petersen
-;; Maintainer: address@hidden
;; Keywords: emacs-lisp, functions, variables
;; Created: 97/07/25
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 54c8afe62b..6ee378e852 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 d1bd46fb58..4a84cfa3e2 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 91c76158a3..81adbd5d4f 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Eric S. Raymond
-;; 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 fa6dc98d04..021708c588 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 38df920f17..f653f6c109 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 a688330b74..e8337a99c8 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
-;; Maintainer: address@hidden
;; Keywords: lisp, extensions
;; Package: emacs
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 54e802edf4..774df3f84e 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 00f72e284a..2753bbd548 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
-;; Maintainer: address@hidden
;; Keywords: strings, regexps, extensions
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index f8268ed27b..c2e1c44dcf 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
;; Author: 1993 Barry A. Warsaw, Century Computing, Inc.
-;; Maintainer: address@hidden
;; Created: 24-Feb-1993
;; Version: 1.8
;; Last Modified: 1993/06/01 21:33:00
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index c7d0268a77..91c043fb3f 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 6d1adae974..4440dbc2fd 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -2,7 +2,6 @@
;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
-;; Maintainer: address@hidden
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index fdd24317c6..9d9028d87d 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
-;; 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 3413cd1513..8997b7501b 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 b9ffe6a6fc..33445835ae 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 f1904e64ef..f488bed3b0 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 29b481849e..60eb30415a 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Jonathan Yavner
-;; Maintainer: Jonathan Yavner
;; Keywords: spreadsheet lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 571f53c795..63510127d4 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Jonathan Yavner
-;; Maintainer: Jonathan Yavner
;; Keywords: safety lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 1ea12859c2..1b94aa80e5 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Jonathan Yavner
-;; Maintainer: Jonathan Yavner
;; Keywords: lisp utility
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index e1370c4591..968dc71f67 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 55aa56b72e..3a791c2af4 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 22ccc35103..668da42a6e 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 4249305fee..ca2d2a23c7 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Scott Draves
-;; Maintainer: address@hidden
;; Adapted-By: ESR
;; Keywords: extensions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 2f271c1f70..0a8351195f 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
-;; Maintainer: address@hidden
;; Created: 15 Dec 1992
;; Keywords: tools, lisp
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 1a2f1f31b1..e374cbec55 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Jonathan Yavner
-;; Maintainer: Jonathan Yavner
;; Keywords: safety lisp utility
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 13ca605dd0..70d6b077eb 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 0cded29193..05b4c010f6 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -4,7 +4,6 @@
;; Author: Juanma Barranquero
;; Inspired by emacs-lock.el by Tom Wurgler
-;; Maintainer: address@hidden
;; Keywords: extensions, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 797de504fd..9ccb40dfe5 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index b8e28f5a75..4aad72caf3 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1994-1995, 2000-2019 Free Software Foundation, Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 3fe33ca13d..484f84eb15 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index f3d2518a49..40c74c9d74 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index d1fe0b8107..dcc327dbd4 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher
-;; Maintainer: Kevin Gallagher
;; Keywords: emulations
;; This file is part of GNU Emacs.
diff --git a/lisp/env.el b/lisp/env.el
index 5a4130eb3b..30b63a8e55 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 9e224e0b82..298cffb49a 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
-;; 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 210830a2b4..eb441c29b4 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,7 +4,6 @@
;; Filename: erc-backend.el
;; Author: Lawrence Mitchell
-;; 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 c8aa887a65..8e2a6b980d 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
-;; 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 210a7736cc..3d99c259aa 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 e724e367ab..3b362774b6 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
-;; 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 a6b7532e1f..b835191960 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,6 @@
;; Author: Ben A. Mesander
;; Noah Friedman
;; Per Persson
-;; 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 a2c9336826..5784e63d7f 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
-;; 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 934b52a938..ef876f464e 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,7 +4,6 @@
;; Author: Andreas Fuchs
;; Mario Lang
-;; 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 884c594b9e..0d16aaf541 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
-;; 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 149c858d2e..ce0104b305 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
-;; 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 d95e0eac0c..96b45899b4 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
-;; 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 08f52f1364..e40dc1fc25 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Mario Lang
-;; 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 896521eaf0..18cc8b5425 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
-;; 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 f0dbe69f79..765898da7b 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
-;; 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 d8d9e17c95..6a2ba785ba 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
-;; Maintainer: address@hidden
;; Old-Version: 0.1
;; Keywords: comm
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 4153f5c57b..fc12dc73ef 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
-;; 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 cc4b4a88f1..98ddebd0cf 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
-;; 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 8173829797..e13404ca13 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
-;; 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 87c3a61b66..252af715d7 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
-;; 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 eca8ad6a89..e92da7b725 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
-;; 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 45dae89990..9bd062a98d 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
-;; 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 cb57883ae6..4e7fed7b40 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 dd2da85d0e..e2489a8d0e 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
-;; 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 2e0e54a030..e1c495c903 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Andreas Fuchs
-;; 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 5459d8b01e..54f91d134c 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
-;; 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 886ba60eb4..f500f4c127 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 34f7ce62c7..38e0b2885b 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 0a1e38fe24..833ad2f1e7 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,7 +4,6 @@
;; Author: Mario Lang
;; Contributor: Eric M. Ludlam
-;; 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 69a83fa032..8df7ea9e4c 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
-;; 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 860fdbb77c..541c67a74f 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
-;; 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 e51e6056fb..14e86c199a 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
-;; 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 0417429552..73c7316b34 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
-;; 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 162b22e15c..20a91b7a30 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
-;; 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 d1fa5c7f12..fc0f6128f6 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 0c4d343090..7eaf7fdab0 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
-;; Maintainer: address@hidden
;; Keywords: abbrev
;; This file is part of GNU Emacs.
diff --git a/lisp/faces.el b/lisp/faces.el
index 89b598669c..137ce99d5e 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 08f7208945..4e91a7affa 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
-;; 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 b71e9204f3..0d156db0e6 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
-;; Maintainer: address@hidden
;; Keywords: files
;; Package: emacs
diff --git a/lisp/files.el b/lisp/files.el
index 1dec0ed7ca..21fa6143e3 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 b74b4a8a40..05c30dedf4 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Thomas Link
-;; 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 ef137be9bb..578f765362 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -5,7 +5,6 @@
;; Author: Roland McGrath ,
;; Sebastian Kremer
-;; 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 87314086a4..f93d2a02d7 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
-;; 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 e92b6b4df2..0b95efaf04 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 3ef88fe686..2eae65a792 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
-;; Maintainer: address@hidden
;; Created: 27 Jan 1994
;; Version: 1.10
;; Keywords: folding, outlines
diff --git a/lisp/follow.el b/lisp/follow.el
index acc2b26c55..47e7aa4cd5 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 6b26f0cb92..da6c91bca5 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 3991a4ee8e..b0e4598bac 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 a8c230cb7b..8e0738f31c 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 92387a2157..632efa81a8 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Simon Josefsson
-;; Maintainer: address@hidden
;; Keywords: frames
;; Package: emacs
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index ceb0d4a30d..e69cbbc37e 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Didier Verna
-;; Maintainer: Didier Verna
;; Created: Tue Jul 20 10:42:55 1999
;; Keywords: calendar mail news
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index aca29fea57..3c69427a1e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Didier Verna
-;; Maintainer: Didier Verna
;; Created: Fri Jul 16 18:55:42 1999
;; Keywords: calendar mail news
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 4d31d0a1f1..9e6c6aeed2 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen
-;; Maintainer: Ted Zlatanov
;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle
;; This file is part of GNU Emacs.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 50d69e70de..9d99736807 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 a16d1e34b4..9c90d6da14 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
-;; 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 6cc3f0d4f7..304c45dad3 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 42ff375565..0677368a4d 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 ee5a9c0fce..df501dfc68 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Keith Gabryelski
-;; Maintainer: address@hidden
;; Keywords: data
;; This file is part of GNU Emacs.
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index a34efa60b4..70fcd1504e 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -7,7 +7,6 @@
;; Filename: hfy-cmap.el
;; Keywords: color, rgb
;; Author: Vivek Dasmohapatra
-;; Maintainer: Vivek Dasmohapatra
;; Created: 2002-01-20
;; Description: fallback code for color name -> rgb mapping
;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 404f448e0d..17d3dc7d8d 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
-;; Maintainer: address@hidden
;; Version: 1.6
;; Keywords: abbrev convenience
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1c09bc26f6..e4fef214d6 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
-;; Maintainer: address@hidden
;; Created: 1998-09-13
;; Keywords: faces, frames, emulations
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 9fc029ec58..f37a76cd7b 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -8,7 +8,6 @@
;; Version: 0.21
;; Keywords: html, hypermedia, markup, etags
;; Author: Vivek Dasmohapatra
-;; Maintainer: Vivek Dasmohapatra
;; Created: 2002-01-05
;; Description: htmlize a buffer/source tree with optional hyperlinks
;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 1b69574a39..f275ec3a52 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Colin Walters
-;; Maintainer: John Paul Wallington
;; Created: 2 Dec 2001
;; Keywords: buffer, convenience
;; Package: ibuffer
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 2b28f18da5..edac484189 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Colin Walters
-;; Maintainer: John Paul Wallington
;; Created: 6 Dec 2001
;; Keywords: buffer, convenience
;; Package: ibuffer
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 628e884094..4dfff3c791 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Colin Walters
-;; Maintainer: John Paul Wallington
;; Created: 8 Sep 2000
;; Keywords: buffer, convenience
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 10fd3a698c..acf877b5d3 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Ken Manheimer
-;; Maintainer: Ken Manheimer
;; 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 c7a31a23e6..1531415e74 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
-;; Maintainer: address@hidden
;; Created: 25 Feb 1994
;; Keywords: lisp
diff --git a/lisp/iimage.el b/lisp/iimage.el
index e51108ee28..17b715a66b 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
;; Author: KOSEKI Yoshinori
-;; Maintainer: address@hidden
;; Keywords: multimedia
;; This file is part of GNU Emacs.
diff --git a/lisp/image.el b/lisp/image.el
index db11302086..6cc2cc3902 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 5084fe61ef..6e16e13183 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -4,7 +4,6 @@
;; Author: Ake Stenhoff
;; Lars Lindberg
-;; Maintainer: address@hidden
;; Created: 8 Feb 1994
;; Keywords: tools convenience
diff --git a/lisp/indent.el b/lisp/indent.el
index bf87d6af76..1dbece73d6 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 c211887a39..61803950d1 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 8108ffe42a..246b3b979b 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 6c2a2dc9b9..c1d3f2b10a 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -9,7 +9,6 @@
;; Keywords: i18n, multilingual, isearch
;; Author: Kenichi HANDA
-;; Maintainer: Kenichi HANDA
;; This file is part of GNU Emacs.
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 395e6c4dcd..b317b8aad7 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 b573e1e47c..14da02c73d 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 543f2e3388..fd68137f2b 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 3266b93b44..a58e4e5dc0 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -8,7 +8,6 @@
;; Author: Kenichi HANDA
;; Naoto TAKAHASHI
-;; Maintainer: Kenichi HANDA
;; 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 0e67a62aa6..f22fb8d38b 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
-;; Maintainer: address@hidden
;; Keywords: mail
;; This file is part of GNU Emacs.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index bb29c2914b..5aaeae438a 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