Remove Maintainer: when it duplicates Author:

The convention is that a file with Author: but not Maintainer: means the author is a maintainer, which makes it confusing when a file lists the same person as author and maintainer. Avoid the confusion by removing the duplicate Maintainer: line.
2019-05-26 00:58:27 -07:00 · 2019-05-26 00:58:27 -07:00 · 797ee5871e
commit 797ee5871e
parent 5e47312c1f
91 changed files with 4 additions and 97 deletions
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@ -2,8 +2,7 @@

 ;; Copyright (C) 1998, 2000, 2002-2019 Free Software Foundation, Inc.

-;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
-;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
+;; Author: Markus Rost <rost@math.uni-bielefeld.de>
 ;; Created: 13 Sep 1998
 ;; Keywords: maint

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax

--- 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 <ryk@dspwiz.com>
-;; Maintainer: Richard Kim <ryk@dspwiz.com>
 ;; Created: June 2002
 ;; Keywords: syntax
 ;;
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations

 ;; This file is part of GNU Emacs.
--- 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 <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Version: 1.0
 ;; Created: Dec 2005
 ;; Keywords: outlines
--- 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 <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Dec 1991 -- first release to usenet
 ;; Version: 2.3
 ;; Keywords: outlines, wp, languages, PGP, GnuPG
--- 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 <alex@gnu.org>
-;; Maintainer: Alex Schroeder <alex@gnu.org>
 ;; Version: 3.4.2
 ;; Keywords: comm processes terminals services

--- 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 <kfogel@red-bean.com>
-;; Maintainer: Karl Fogel <kfogel@red-bean.com>
 ;; Created: July, 1993
 ;; Keywords: bookmarks, placeholders, annotations

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 27 Apr 2004
 ;; Keywords: syntax

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>

 ;; This file is part of GNU Emacs.

--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@ -4,7 +4,6 @@
 ;; Foundation, Inc.

 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Maintainer: Eric M. Ludlam <zappo@gnu.org>

 ;; This file is part of GNU Emacs.

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 Aug 2001
 ;; Keywords: syntax

--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@ -4,7 +4,6 @@
 ;; Software Foundation, Inc.

 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 January 2002
 ;; Keywords: syntax

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; This file is part of GNU Emacs.
--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 15 Dec 2001
 ;; Keywords: syntax

--- 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 <emacs18@gmail.com>
-;; Maintainer: Richard Kim <emacs18@gmail.com>
 ;; Created: June 2002
 ;; Keywords: syntax

--- 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 <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 30 January 2002
 ;; Keywords: syntax

--- 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 <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Version: 2.1
 ;; Keywords: convenience text
 ;; X-URL: https://www.emacswiki.org/emacs/ViniciusJoseLatorre
--- 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 <tsdh@gnu.org>
-;; Maintainer: Tassilo Horn <tsdh@gnu.org>
 ;; Keywords: files, pdf, ps, dvi

 ;; This file is part of GNU Emacs.
--- 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 <daveg@synaptics.com>
-;; Maintainer: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.01
 ;; Keywords: abbrev

--- 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 <friedman@splode.com>
-;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: extensions
 ;; Created: 1995-10-06

--- 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 <petersen@kurims.kyoto-u.ac.jp>
-;; Maintainer: petersen@kurims.kyoto-u.ac.jp
 ;; Keywords: emacs-lisp, functions, variables
 ;; Created: 97/07/25

--- 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. <bwarsaw@cen.com>
-;; Maintainer:    bwarsaw@cen.com
 ;; Created:       24-Feb-1993
 ;; Version:       1.8
 ;; Last Modified: 1993/06/01 21:33:00
--- 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 <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: spreadsheet lisp utility
 ;; Package: testcover

--- 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 <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: safety lisp utility
 ;; Package: testcover

--- 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 <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: lisp utility

 ;; This file is part of GNU Emacs.
--- 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 <jyavner@member.fsf.org>
-;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Keywords: safety lisp utility

 ;; This file is part of GNU Emacs.
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@ -4,7 +4,6 @@
 ;; Foundation, Inc.

 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt

--- 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 <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt

--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt

--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@ -4,7 +4,6 @@
 ;; Foundation, Inc.

 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations
 ;; Package: edt

--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
-;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Keywords: emulations

 ;; This file is part of GNU Emacs.
--- 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 <didier@xemacs.org>
-;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Tue Jul 20 10:42:55 1999
 ;; Keywords:      calendar mail news

--- 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 <didier@xemacs.org>
-;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Fri Jul 16 18:55:42 1999
 ;; Keywords:      calendar mail news

--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@ -7,7 +7,6 @@
 ;; Filename: hfy-cmap.el
 ;; Keywords: color, rgb
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
-;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-20
 ;; Description: fallback code for color name -> rgb mapping
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@ -8,7 +8,6 @@
 ;; Version: 0.21
 ;; Keywords: html, hypermedia, markup, etags
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
-;; Maintainer: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-05
 ;; Description: htmlize a buffer/source tree with optional hyperlinks
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@ -4,7 +4,6 @@
 ;; Foundation, Inc.

 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Mar 1993 Ken Manheimer, klm@nist.gov - first release to usenet
 ;; Keywords: help, abbrev

--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@ -9,7 +9,6 @@
 ;; Keywords: i18n, multilingual, isearch

 ;; Author: Kenichi Handa <handa@gnu.org>
-;; Maintainer: Kenichi Handa <handa@gnu.org>

 ;; This file is part of GNU Emacs.

--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.

 ;; Author: João Távora <joaotavora@gmail.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Keywords: processes, languages, extensions
 ;; Package-Requires: ((emacs "25.2"))
 ;; Version: 1.0.7
--- a/lisp/leim/quail/latin-pre.el
+++ b/lisp/leim/quail/latin-pre.el
@ -32,7 +32,6 @@
 ;;
 ;; polish-slash:
 ;; Author: Włodek Bzyl <matwb@univ.gda.pl>
-;; Maintainer: Włodek Bzyl <matwb@univ.gda.pl>
 ;;
 ;; latin-[89]-prefix: Dave Love <fx@gnu.org>
 ;;
--- a/lisp/leim/quail/sami.el
+++ b/lisp/leim/quail/sami.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2019 Free Software Foundation, Inc.

 ;; Author: Wojciech S. Gac <wojciech.s.gac@gmail.com>
-;; Maintainer: Wojciech S. Gac <wojciech.s.gac@gmail.com>>
 ;; Keywords: i18n, multilingual, input method, Sámi

 ;; This file is part of GNU Emacs.
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Stephen Eglen <stephen@gnu.org>
-;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Created: 22 Jan 1997
 ;; Keywords: mail
 ;; location: http://www.anc.ed.ac.uk/~stephen/emacs/
--- a/lisp/master.el
+++ b/lisp/master.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: Alex Schroeder <alex@gnu.org>
 ;; Version: 1.0.2
 ;; Keywords: comm

--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2006-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@ -4,7 +4,6 @@
 ;; Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Version: 8.6+git
 ;; Keywords: mail

--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2003, 2006-2019 Free Software Foundation, Inc.

 ;; Author: Peter S. Galbraith <psg@debian.org>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@ -4,7 +4,6 @@
 ;; Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.

 ;; Author: Bill Wohler <wohler@newt.com>
-;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el

--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Sam Steingold <sds@gnu.org>
-;; Maintainer: Sam Steingold <sds@gnu.org>
 ;; Created: 1998-05-18
 ;; Keywords: utilities

--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Dave Pearson <davep@davep.org>
-;; Maintainer: Dave Pearson <davep@davep.org>
 ;; Created: 1999-05-28
 ;; Keywords: hypermedia

--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@ -3,8 +3,7 @@
 ;; Copyright (C) 1992-1995, 1997-1998, 2001-2019 Free Software
 ;; Foundation, Inc.

-;; Author: Noah Friedman
-;; Maintainer: Noah Friedman <friedman@splode.com>
+;; Author: Noah Friedman <friedman@splode.com>
 ;; Keywords: unix, comm

 ;; This file is part of GNU Emacs.
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1996-1997, 2000-2019 Free Software Foundation, Inc.

 ;; Author: Stephen Eglen <stephen@gnu.org>
-;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience
 ;; Obsolete-since: 24.4

--- a/lisp/obsolete/tpu-edt.el
+++ b/lisp/obsolete/tpu-edt.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.

 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Version: 4.5
 ;; Keywords: emulations
 ;; Obsolete-since: 24.5
--- a/lisp/obsolete/tpu-extras.el
+++ b/lisp/obsolete/tpu-extras.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.

 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: emulations
 ;; Package: tpu-edt
 ;; Obsolete-since: 24.5
--- a/lisp/obsolete/tpu-mapper.el
+++ b/lisp/obsolete/tpu-mapper.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: emulations
 ;; Package: tpu-edt
 ;; Obsolete-since: 24.5
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@ -4,7 +4,6 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 ;; Version: 9.1.9
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Dave Pearson <davep@davep.org>
-;; Maintainer: Dave Pearson <davep@davep.org>
 ;; Created: 1998-10-03
 ;; Keywords: games puzzles

--- a/lisp/printing.el
+++ b/lisp/printing.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2001, 2003-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.9.3
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.10
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.1
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.9
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.0
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Old-Version: 1.4
 ;; Package: ebnf2ps
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 4.4
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999-2019 Free Software Foundation, Inc.

 ;; Author: Milan Zamazal <pdm@zamazal.org>
-;; Maintainer: Milan Zamazal <pdm@zamazal.org>
 ;; Keywords: tools

 ;; This file is part of GNU Emacs.
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.

 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
-;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Created:    20 Aug 1997
 ;; Version:    1.1i
 ;; Keywords:   PostScript, languages
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2019 Free Software Foundation, Inc.

 ;; Author:      Reto Zimmermann <reto@gnu.org>
-;; Maintainer:  Reto Zimmermann <reto@gnu.org>
 ;; Version:     2.28
 ;; Keywords:    languages vera
 ;; WWW:         http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@ -4,8 +4,6 @@

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;;	Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 ;; Package: ps-print
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@ -4,8 +4,6 @@

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;	Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;;	Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: wp, print, PostScript, multibyte, mule
 ;; Package: ps-print

--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001-2019 Free Software Foundation, Inc.

 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 24 Mar 2001
 ;; Version: 1.6
 ;; Keywords: convenience
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.

 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
-;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Keywords:     mouse
 ;; Version:	 1.2.6
 ;; Release-date: 6-Aug-2004
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@ -3,8 +3,7 @@
 ;; Copyright (C) 1990-1993, 1996, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.

-;; Author: Masanobu Umeda
-;; Maintainer: umerin@mse.kyutech.ac.jp
+;; Author: Masanobu Umeda <umerin@mse.kyutech.ac.jp>
 ;; Keywords: news

 ;; This file is part of GNU Emacs.
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.

 ;; Author: David Ponce <david@dponce.com>
-;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 16 Feb 2001
 ;; Keywords: extensions

--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@ -3,8 +3,7 @@
 ;; Copyright (C) 1994-1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.

-;; Author: Noah Friedman
-;; Maintainer: Noah Friedman <friedman@splode.com>
+;; Author: Noah Friedman <friedman@splode.com>
 ;; Keywords: extensions, timers
 ;; Created: 1994-07-13

--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.

 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Maintainer: Bill Perry <wmperry@gnu.org>
 ;; Keywords: url, vc
 ;; Package: vc

--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.

 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
-;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
 ;; Keywords: terminals

 ;; This file is part of GNU Emacs.
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.

 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;; Keywords: data, wp
 ;; Version: 13.2.2
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
--- a/test/lisp/jsonrpc-tests.el
+++ b/test/lisp/jsonrpc-tests.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2018-2019 Free Software Foundation, Inc.

 ;; Author: João Távora <joaotavora@gmail.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Keywords: tests

 ;; This program is free software; you can redistribute it and/or modify