[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 797ee58 1/2: Remove Maintainer: when it duplicates
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] master 797ee58 1/2: Remove Maintainer: when it duplicates Author: |
|
Date: |
Sun, 26 May 2019 04:00:32 -0400 (EDT) |
branch: master
commit 797ee5871e458d6d97f57a24405412a053f5ef32
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
admin/cus-test.el | 3 +--
admin/grammars/grammar.wy | 1 -
admin/grammars/java-tags.wy | 1 -
admin/grammars/python.wy | 1 -
etc/edt-user.el | 1 -
lisp/allout-widgets.el | 1 -
lisp/allout.el | 1 -
lisp/ansi-color.el | 1 -
lisp/bookmark.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/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/delim-col.el | 1 -
lisp/doc-view.el | 1 -
lisp/edmacro.el | 1 -
lisp/emacs-lisp/eldoc.el | 1 -
lisp/emacs-lisp/find-func.el | 1 -
lisp/emacs-lisp/regi.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/unsafep.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/gnus/gnus-diary.el | 1 -
lisp/gnus/nndiary.el | 1 -
lisp/hfy-cmap.el | 1 -
lisp/htmlfontify.el | 1 -
lisp/icomplete.el | 1 -
lisp/international/isearch-x.el | 1 -
lisp/jsonrpc.el | 1 -
lisp/leim/quail/latin-pre.el | 1 -
lisp/leim/quail/sami.el | 1 -
lisp/mail/mspools.el | 1 -
lisp/master.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-letter.el | 1 -
lisp/mh-e/mh-limit.el | 1 -
lisp/mh-e/mh-mime.el | 1 -
lisp/mh-e/mh-scan.el | 1 -
lisp/mh-e/mh-seq.el | 1 -
lisp/mh-e/mh-show.el | 1 -
lisp/mh-e/mh-utils.el | 1 -
lisp/mh-e/mh-xface.el | 1 -
lisp/midnight.el | 1 -
lisp/net/quickurl.el | 1 -
lisp/net/rlogin.el | 3 +--
lisp/obsolete/iswitchb.el | 1 -
lisp/obsolete/tpu-edt.el | 1 -
lisp/obsolete/tpu-extras.el | 1 -
lisp/obsolete/tpu-mapper.el | 1 -
lisp/org/org.el | 1 -
lisp/play/5x5.el | 1 -
lisp/printing.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/glasses.el | 1 -
lisp/progmodes/ps-mode.el | 1 -
lisp/progmodes/vera-mode.el | 1 -
lisp/ps-def.el | 2 --
lisp/ps-mule.el | 2 --
lisp/ruler-mode.el | 1 -
lisp/textmodes/artist.el | 1 -
lisp/timezone.el | 3 +--
lisp/tree-widget.el | 1 -
lisp/type-break.el | 3 +--
lisp/vc/vc-dav.el | 1 -
lisp/vt-control.el | 1 -
lisp/whitespace.el | 1 -
test/lisp/jsonrpc-tests.el | 1 -
91 files changed, 4 insertions(+), 97 deletions(-)
diff --git a/admin/cus-test.el b/admin/cus-test.el
index f9fd53d..f7fbd75 100644
--- 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 <address@hidden>
-;; Maintainer: Markus Rost <address@hidden>
+;; Author: Markus Rost <address@hidden>
;; Created: 13 Sep 1998
;; Keywords: maint
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index f7664de..5b06917 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; 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 88beafe..db4f61c 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 26 Aug 2002
;; Keywords: syntax
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 5e5bdc1..695e612 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 <address@hidden>
-;; Maintainer: Richard Kim <address@hidden>
;; Created: June 2002
;; Keywords: syntax
;;
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 5aede6b..10ea4c4 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; This file is part of GNU Emacs.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index fd04c31..e7da08d 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 <ken dot manheimer at gmail...>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
;; Version: 1.0
;; Created: Dec 2005
;; Keywords: outlines
diff --git a/lisp/allout.el b/lisp/allout.el
index 0760855..251f2f5 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 <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
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 136e69f..fe8cada 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 <address@hidden>
-;; Maintainer: Alex Schroeder <address@hidden>
;; Version: 3.4.2
;; Keywords: comm processes terminals services
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3041401..b1fe690 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 <address@hidden>
-;; Maintainer: Karl Fogel <address@hidden>
;; Created: July, 1993
;; Keywords: bookmarks, placeholders, annotations
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index f83decb..fe87d1a 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 27 Apr 2004
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/bovine/grammar.el
b/lisp/cedet/semantic/bovine/grammar.el
index f77bc9d..7c25b79 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 26 Aug 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f6d67cf..7fb54cb 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 15ab50c..027c989 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
-;; Maintainer: Eric M. Ludlam <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 6bb7710..122b5d3 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 30 Aug 2001
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/comp.el
b/lisp/cedet/semantic/wisent/comp.el
index db910b1..051b898 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 30 January 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/grammar.el
b/lisp/cedet/semantic/wisent/grammar.el
index 7d77671..d23e293 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; 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 4bf7a8e..87c3090 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 15 Dec 2001
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/python.el
b/lisp/cedet/semantic/wisent/python.el
index c5849ff..f0e294e 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 <address@hidden>
-;; Maintainer: Richard Kim <address@hidden>
;; Created: June 2002
;; Keywords: syntax
diff --git a/lisp/cedet/semantic/wisent/wisent.el
b/lisp/cedet/semantic/wisent/wisent.el
index 2108242..401b404 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 30 January 2002
;; Keywords: syntax
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 4b4fc7f..3e309e9 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Version: 2.1
;; Keywords: convenience text
;; X-URL: https://www.emacswiki.org/emacs/ViniciusJoseLatorre
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index a706907..7ab8539 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 <address@hidden>
-;; Maintainer: Tassilo Horn <address@hidden>
;; Keywords: files, pdf, ps, dvi
;; This file is part of GNU Emacs.
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index b480b23..da3e782 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 <address@hidden>
-;; Maintainer: Dave Gillespie <address@hidden>
;; Version: 2.01
;; Keywords: abbrev
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 23f303b..16b5863 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 <address@hidden>
-;; Maintainer: Noah Friedman <address@hidden>
;; Keywords: extensions
;; Created: 1995-10-06
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index b63d4d4..9fc7e4a 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 <address@hidden>
-;; Maintainer: address@hidden
;; Keywords: emacs-lisp, functions, variables
;; Created: 97/07/25
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index f8268ed..c2e1c44 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. <address@hidden>
-;; Maintainer: address@hidden
;; Created: 24-Feb-1993
;; Version: 1.8
;; Last Modified: 1993/06/01 21:33:00
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 8d2f821..d34d30f 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 <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: spreadsheet lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/tcover-unsafep.el
b/lisp/emacs-lisp/tcover-unsafep.el
index daae3ad..fc6b6cb 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 <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: safety lisp utility
;; Package: testcover
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 1ea1285..1b94aa8 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 <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: lisp utility
;; This file is part of GNU Emacs.
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 1a2f1f3..e374cbe 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 <address@hidden>
-;; Maintainer: Jonathan Yavner <address@hidden>
;; Keywords: safety lisp utility
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 797de50..9ccb40d 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index b8e28f5..4aad72c 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 <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 3fe33ca..484f84e 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index f3d2518..40c74c9 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -4,7 +4,6 @@
;; Foundation, Inc.
;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; Package: edt
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index d1fe0b8..dcc327db 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Kevin Gallagher <address@hidden>
-;; Maintainer: Kevin Gallagher <address@hidden>
;; Keywords: emulations
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index ceb0d4a..e69cbbc 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 <address@hidden>
-;; Maintainer: Didier Verna <address@hidden>
;; 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 aca29fe..3c69427 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 <address@hidden>
-;; Maintainer: Didier Verna <address@hidden>
;; Created: Fri Jul 16 18:55:42 1999
;; Keywords: calendar mail news
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index a34efa6..70fcd15 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 <address@hidden>
-;; Maintainer: Vivek Dasmohapatra <address@hidden>
;; Created: 2002-01-20
;; Description: fallback code for color name -> rgb mapping
;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 9fc029e..f37a76c 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -8,7 +8,6 @@
;; Version: 0.21
;; Keywords: html, hypermedia, markup, etags
;; Author: Vivek Dasmohapatra <address@hidden>
-;; Maintainer: Vivek Dasmohapatra <address@hidden>
;; Created: 2002-01-05
;; Description: htmlize a buffer/source tree with optional hyperlinks
;; URL: http://rtfm.etla.org/emacs/htmlfontify/
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 698025e..51f2611 100644
--- 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, address@hidden - first release to usenet
;; Keywords: help, abbrev
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index c12e7b3..dd4c98f 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -9,7 +9,6 @@
;; Keywords: i18n, multilingual, isearch
;; Author: Kenichi Handa <address@hidden>
-;; Maintainer: Kenichi Handa <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index c02e685..0fffee6 100644
--- 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 <address@hidden>
-;; Maintainer: João Távora <address@hidden>
;; Keywords: processes, languages, extensions
;; Package-Requires: ((emacs "25.2"))
;; Version: 1.0.7
diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el
index bcf81f4..8e0b274 100644
--- a/lisp/leim/quail/latin-pre.el
+++ b/lisp/leim/quail/latin-pre.el
@@ -32,7 +32,6 @@
;;
;; polish-slash:
;; Author: Włodek Bzyl <address@hidden>
-;; Maintainer: Włodek Bzyl <address@hidden>
;;
;; latin-[89]-prefix: Dave Love <address@hidden>
;;
diff --git a/lisp/leim/quail/sami.el b/lisp/leim/quail/sami.el
index 7cfd0b7..88d3409 100644
--- 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 <address@hidden>
-;; Maintainer: Wojciech S. Gac <address@hidden>>
;; Keywords: i18n, multilingual, input method, Sámi
;; This file is part of GNU Emacs.
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 9c8e72e..b1cbd9e 100644
--- 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 <address@hidden>
-;; Maintainer: Stephen Eglen <address@hidden>
;; Created: 22 Jan 1997
;; Keywords: mail
;; location: http://www.anc.ed.ac.uk/~stephen/emacs/
diff --git a/lisp/master.el b/lisp/master.el
index a054d7f..36384a8 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: Alex Schroeder <address@hidden>
;; Version: 1.0.2
;; Keywords: comm
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index 3c0c481..13a1901 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index b96ef74..a5614f5 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index eb173df..a459d27 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index bc09764..c70e11e 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -4,7 +4,6 @@
;; Software Foundation, Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Version: 8.6+git
;; Keywords: mail
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index caf4071..5b4c34f 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index da7c87e..9f603c0 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 4fc31ed..46762f1 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 27dda79..ee6fa83 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 9901548..6f12696 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index cd689d6..8c1a07d 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index f7d7c62..9989dc9 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 7dad81d..4f70681 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index cad6278..0938729 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -4,7 +4,6 @@
;; Inc.
;; Author: Bill Wohler <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index ddb001a..4ff84a6 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Wohler <address@hidden>
;; Keywords: mail
;; See: mh-e.el
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 86c1e21..fa41d80 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -3,7 +3,6 @@
;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
;; Author: Sam Steingold <address@hidden>
-;; Maintainer: Sam Steingold <address@hidden>
;; Created: 1998-05-18
;; Keywords: utilities
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 3f7e9d1..91e980e 100644
--- 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 <address@hidden>
-;; Maintainer: Dave Pearson <address@hidden>
;; Created: 1999-05-28
;; Keywords: hypermedia
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index bf6f535..9da3548 100644
--- 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 <address@hidden>
+;; Author: Noah Friedman <address@hidden>
;; Keywords: unix, comm
;; This file is part of GNU Emacs.
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index 5b0df1e..ad2067f 100644
--- 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 <address@hidden>
-;; Maintainer: Stephen Eglen <address@hidden>
;; Keywords: completion convenience
;; Obsolete-since: 24.4
diff --git a/lisp/obsolete/tpu-edt.el b/lisp/obsolete/tpu-edt.el
index 8db1c4f..0848135 100644
--- 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 <address@hidden>
-;; Maintainer: Rob Riepel <address@hidden>
;; Version: 4.5
;; Keywords: emulations
;; Obsolete-since: 24.5
diff --git a/lisp/obsolete/tpu-extras.el b/lisp/obsolete/tpu-extras.el
index f19a67d..8b5818d 100644
--- 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 <address@hidden>
-;; Maintainer: Rob Riepel <address@hidden>
;; Keywords: emulations
;; Package: tpu-edt
;; Obsolete-since: 24.5
diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el
index 60e0e49..a7aa0cb 100644
--- 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 <address@hidden>
-;; Maintainer: Rob Riepel <address@hidden>
;; Keywords: emulations
;; Package: tpu-edt
;; Obsolete-since: 24.5
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 119d0a2..5aa49b2 100644
--- 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
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index e13a3c9..28748cc 100644
--- 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 <address@hidden>
-;; Maintainer: Dave Pearson <address@hidden>
;; Created: 1998-10-03
;; Keywords: games puzzles
diff --git a/lisp/printing.el b/lisp/printing.el
index f2495ec..d584e46 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript
;; Version: 6.9.3
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index b8441a7..53d37b6 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.2
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index f28f490..70dc845 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.10
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 98284fa..94d9643 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.1
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 5f9f9b2..25500f1 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.2
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 88644bb..dbba87b 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.9
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index cbc058e..291d510 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.0
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 9e71235..e55e01e 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Old-Version: 1.4
;; Package: ebnf2ps
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 7e7efac..f26ad0a 100644
--- 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 <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, ebnf, PostScript
;; Version: 4.4
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index 2bfc256..8dcf84a 100644
--- 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 <address@hidden>
-;; Maintainer: Milan Zamazal <address@hidden>
;; Keywords: tools
;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index d940627..92824b6 100644
--- 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 <address@hidden>
-;; Maintainer: Peter Kleiweg <address@hidden>
;; Created: 20 Aug 1997
;; Version: 1.1i
;; Keywords: PostScript, languages
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index a03556e..f34b21e 100644
--- 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 <address@hidden>
-;; Maintainer: Reto Zimmermann <address@hidden>
;; Version: 2.28
;; Keywords: languages vera
;; WWW: http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index d248556..0f3b2f7 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -4,8 +4,6 @@
;; Author: Vinicius Jose Latorre <address@hidden>
;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
-;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
;; Package: ps-print
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 537ba96..24604e9 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -4,8 +4,6 @@
;; Author: Vinicius Jose Latorre <address@hidden>
;; Kenichi Handa <address@hidden> (multi-byte characters)
-;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
-;; Vinicius Jose Latorre <address@hidden>
;; Keywords: wp, print, PostScript, multibyte, mule
;; Package: ps-print
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index c5c88d0..093dd49 100644
--- 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 24 Mar 2001
;; Version: 1.6
;; Keywords: convenience
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index e9b1779..19d1df6 100644
--- 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 <address@hidden>
-;; Maintainer: Tomas Abrahamsson <address@hidden>
;; Keywords: mouse
;; Version: 1.2.6
;; Release-date: 6-Aug-2004
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 621f024..79720b4 100644
--- 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: address@hidden
+;; Author: Masanobu Umeda <address@hidden>
;; Keywords: news
;; This file is part of GNU Emacs.
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 61bfacd..e4da23a 100644
--- 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 <address@hidden>
-;; Maintainer: David Ponce <address@hidden>
;; Created: 16 Feb 2001
;; Keywords: extensions
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 0ad79dd..5202960 100644
--- 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 <address@hidden>
+;; Author: Noah Friedman <address@hidden>
;; Keywords: extensions, timers
;; Created: 1994-07-13
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index d0b202c..693056c 100644
--- 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 <address@hidden>
-;; Maintainer: Bill Perry <address@hidden>
;; Keywords: url, vc
;; Package: vc
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 7175095..ee24634 100644
--- 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 <address@hidden>
-;; Maintainer: Rob Riepel <address@hidden>
;; Keywords: terminals
;; This file is part of GNU Emacs.
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 2463e65..d0368b5 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -3,7 +3,6 @@
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <address@hidden>
-;; Maintainer: Vinicius Jose Latorre <address@hidden>
;; Keywords: data, wp
;; Version: 13.2.2
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el
index 52f709f..f3e4873 100644
--- 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 <address@hidden>
-;; Maintainer: João Távora <address@hidden>
;; Keywords: tests
;; This program is free software; you can redistribute it and/or modify