Release ERC 5.4.1

* doc/misc/erc.texi (ERCVER): Bump to 5.4.1.
* etc/ERC-NEWS: Add entry for 5.4.1 with explanations.
* lisp/erc/erc.el (Version, erc-version): Bump to 5.4.1.
(customize-package-emacs-version-alist): Add entry for 5.4.1.

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 69376df9747f37994fb10df27f5fd6940eb0d932..3b8e231d3a17c111e75842fc453100128bec6ca4 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename ../../info/erc.info
 @settitle ERC Manual
-@set ERCVER 5.4
+@set ERCVER 5.4.1
 @set ERCDIST as distributed with Emacs @value{EMACSVER}
 @include docstyle.texi
 @syncodeindex fn cp

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index f533c58aa41aac54061d880a624aeced796bb745..31ea3de620d1316c93994fb3dc98f6988a6769e7 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -11,6 +11,14 @@ This file is about changes in ERC, the powerful, modular, and
 extensible IRC (Internet Relay Chat) client distributed with
 GNU Emacs since Emacs version 22.1.
 
+\f
+* Changes in ERC 5.4.1
+
+** No user-visible changes since ERC 5.4, but a few tweaks in some ERC
+file headers and the ERC manual in order to successfully build ERC for
+GNU ELPA.  (See below for the news item of ERC now being distributed
+on GNU ELPA in addition to its continued inclusion in GNU Emacs core.)
+
 \f
 * Changes in ERC 5.4
 

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 2a28dafab28bb6d284a40f05d9f156f65899f6a6..88c105040c56e8a4b7a166939dd82be4489b18d1 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -12,7 +12,7 @@
 ;;               David Edmondson (dme@dme.org)
 ;;               Michael Olson (mwolson@gnu.org)
 ;;               Kelvin White (kwhite@gnu.org)
-;; Version: 5.4
+;; Version: 5.4.1
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: IRC, chat, client, Internet
 ;; URL: https://www.gnu.org/software/emacs/erc.html
@@ -69,7 +69,7 @@
 (require 'iso8601)
 (eval-when-compile (require 'subr-x))
 
-(defconst erc-version "5.4"
+(defconst erc-version "5.4.1"
   "This version of ERC.")
 
 (defvar erc-official-location
@@ -83,7 +83,8 @@
  'customize-package-emacs-version-alist
  '(ERC ("5.2" . "22.1")
        ("5.3" . "23.1")
-       ("5.4" . "28.1")))
+       ("5.4" . "28.1")
+       ("5.4.1" . "29.1")))
 
 (defgroup erc nil
   "Emacs Internet Relay Chat client."