; Undo erroneous change in ERC's sample configuration

* doc/misc/erc.texi (Sample Configuration): Remove `erc-modules' from
the `:custom' section of the `use-package' declaration for feature `erc'
because its presence there depends on `:defer' being non-nil, and this
configuration is supposed to be `:defer' agnostic.  This reverts part of
3f1ce47f "; Add face customization to ERC's sample config".
* etc/ERC-NEWS: Mention `erc-modules' no longer being autoloaded.
* lisp/erc/erc-match.el (erc-text-matched-hooks): Explain expected
format of non-NUH matches.
* test/lisp/erc/erc-match-tests.el (test/lisp/erc/erc-match-tests.el):
Inhibit messages when running non-interactively.

1 files changed, 7 insertions, 4 deletions

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 9368c9ce070..939d93d6aa8 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1324,11 +1324,14 @@ settings (@pxref{Sample configuration via Customize}).
 ;;; My ERC configuration -*- lexical-binding: t -*-
 
 (use-package erc
-  :custom
+  :config
   ;; Prefer SASL to NickServ, colorize nicknames, and show side panels
-  ;; with joined channels and members.
-  (erc-modules (append '(sasl nicks bufbar nickbar scrolltobottom)
-                       erc-modules))
+  ;; with joined channels and members
+  (setopt erc-modules
+          (seq-union '(sasl nicks bufbar nickbar scrolltobottom)
+                     erc-modules))
+
+  :custom
   ;; Protect me from accidentally sending excess lines.
   (erc-inhibit-multiline-input t)
   (erc-send-whitespace-lines t)