; 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, 2 insertions, 1 deletions

diff --git a/test/lisp/erc/erc-match-tests.el b/test/lisp/erc/erc-match-tests.el
index d22a945724b..fb92a153c95 100644
--- a/test/lisp/erc/erc-match-tests.el
+++ b/test/lisp/erc/erc-match-tests.el
@@ -569,7 +569,8 @@
 
 (defun erc-match-tests--log-matches ()
   (let ((erc-log-matches-flag t)
-        (erc-timestamp-format "[@@TS@@]"))
+        (erc-timestamp-format "[@@TS@@]")
+        (inhibit-message noninteractive))
     (erc-match-tests--hl-type-keyword)
     (with-current-buffer "*scratch*"
       (ert-simulate-keys "\t\r"