From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Oct 2021 15:04:57 +0000 (-0700)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3671^2~610
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98f10f47a7da964d75a23f6912b35b6ef472b123;p=emacs.git

Merge from origin/emacs-28

ac06608878 (origin/emacs-28) Release ERC 5.4
a1a589d07b * etc/ERC-NEWS: Announce ERC's addition to GNU ELPA.
6c7947f0a1 * etc/ERC-NEWS: Fix outline level for the recent additions.
c480b68644 Add ERC entries for 'customize-package-emacs-version-alist'
4afff515c8 Expand the full file name
36a485a1af Obsolete XEmacs compat convention in 'erc-button-press-but...
---

98f10f47a7da964d75a23f6912b35b6ef472b123