>From ac81b9c1848899a4686f8eb6284b3559bf64ae31 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 9 Feb 2023 21:27:04 -0800 Subject: [PATCH 0/2] *** NOT A PATCH *** *** BLURB HERE *** F. Jason Park (2): ; Prepare to update ERC version to 5.5 Release ERC 5.5 doc/misc/erc.texi | 14 +++++++++--- etc/ERC-NEWS | 20 ++++++++++------ lisp/erc/erc-backend.el | 4 ++-- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-sasl.el | 39 ++++++++++++++++---------------- lisp/erc/erc-services.el | 6 ++--- lisp/erc/erc.el | 49 ++++++++++++++++++++-------------------- 7 files changed, 74 insertions(+), 60 deletions(-) Interdiff: diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 37294c67457..b80affbc954 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -90,7 +90,8 @@ Introduction @chapter Introduction ERC is a powerful, modular, and extensible IRC client for Emacs. -It is distributed with Emacs since version 22.1. +It has been included in Emacs since 2006 (@pxref{History}) and is also +available on GNU ELPA. IRC is short for Internet Relay Chat. When using IRC, you can communicate with other users on the same IRC network. There are many @@ -1463,6 +1464,7 @@ Getting Help and Reporting Bugs @item @uref{https://www.emacswiki.org/emacs/ERC} is the emacswiki.org page for ERC@. Anyone may add tips, hints, etc.@: to it. +If you do so, please help keep it up to date. @item You can ask questions about using ERC on the Emacs mailing list, @@ -1471,7 +1473,13 @@ Getting Help and Reporting Bugs @item You can visit the IRC Libera.Chat channel @samp{#emacs}. Many of the contributors are frequently around and willing to answer your -questions. +questions. You can also try the relatively quiet @samp{#erc}, on the +same network, for more involved questions. + +@item +You can check GNU ELPA between Emacs releases to see if a newer +version is available that might contain a fix for your issue: +@uref{https://elpa.gnu.org/packages/erc.html}. @item To report a bug in ERC, use @kbd{M-x erc-bug}. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 6e83465f28f..446865301f3 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -13,7 +13,7 @@ ;; Michael Olson (mwolson@gnu.org) ;; Kelvin White (kwhite@gnu.org) ;; Version: 5.5 -;; Package-Requires: ((emacs "27.1") (compat "29.1.3.2")) +;; Package-Requires: ((emacs "27.1") (compat "29.1.3.3")) ;; Keywords: IRC, chat, client, Internet ;; URL: https://www.gnu.org/software/emacs/erc.html -- 2.39.1