Merge remote-tracking branch 'savannah/master' into master-android-1

11 files changed, 3 insertions, 19 deletions

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index a4a78c66b02..a75ceffb6c8 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2004-2024 Free Software Foundation, Inc.
 
-;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
 ;; Created: 2004-05-7
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index ee8eac6732a..e9956222e9c 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -1,16 +1,12 @@
 ;;; hfy-cmap.el --- Fallback color name -> rgb mapping for `htmlfontify'  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2003, 2009-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
-;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
-;; Filename: hfy-cmap.el
 ;; Keywords: color, rgb
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
 ;; Created: 2002-01-20
-;; Description: fallback code for color name -> rgb mapping
 ;; URL: http://rtfm.etla.org/emacs/htmlfontify/
-;; Last-Updated: Sat 2003-02-15 03:49:32 +0000
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 89c2bee2204..53cb00eb1ba 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1,15 +1,12 @@
 ;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks -*- lexical-binding: t -*-
 
-;; Copyright (C) 2002-2003, 2009-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2024 Free Software Foundation, Inc.
 
-;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
-;; Filename: htmlfontify.el
-;; Version: 0.21
+;; Old-Version: 0.21
 ;; Keywords: html, hypermedia, markup, etags
 ;; Author: 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/
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 920111f2134..764ba979ddd 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newst-backend.el
 ;; URL:         https://www.nongnu.org/newsticker
 ;; Keywords:    News, RSS, Atom
 ;; Package:     newsticker
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 6b7050a9ff0..0ff7985f0dc 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newst-plainview.el
 ;; URL:         https://www.nongnu.org/newsticker
 ;; Package:     newsticker
 
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 130e01a0deb..1638fc877da 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newst-reader.el
 ;; URL:         https://www.nongnu.org/newsticker
 ;; Package:     newsticker
 
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index cd0ecd4b868..01cd2964778 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newst-ticker.el
 ;; URL:         https://www.nongnu.org/newsticker
 ;; Keywords:    News, RSS, Atom
 ;; Package:     newsticker
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 81b6e275ded..89f45ae1049 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2008-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newst-treeview.el
 ;; Created:     2007
 ;; Keywords:    News, RSS, Atom
 ;; Package:     newsticker
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index b34c0268941..6316b8b26ac 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
-;; Filename:    newsticker.el
 ;; URL:         https://www.nongnu.org/newsticker
 ;; Created:     17. June 2003
 ;; Keywords:    News, RSS, Atom
diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el
index 6c7f8c0a1ea..9ad2e199913 100644
--- a/lisp/use-package/use-package-ensure-system-package.el
+++ b/lisp/use-package/use-package-ensure-system-package.el
@@ -6,7 +6,6 @@
 ;; Keywords: convenience, tools, extensions
 ;; URL: https://github.com/waymondo/use-package-ensure-system-package
 ;; Package-Requires: ((use-package "2.1") (system-packages "1.0.4"))
-;; Filename: use-package-ensure-system-package.el
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/wdired.el b/lisp/wdired.el
index d5d593483dc..be7e39c8957 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 2004-2024 Free Software Foundation, Inc.
 
-;; Filename: wdired.el
 ;; Author: Juan León Lahoz García <juanleon1@gmail.com>
 ;; Old-Version: 2.0
 ;; Keywords: dired, environment, files, renaming