; Silence byte compiler in erc-netsplit-JOIN

* etc/ERC-NEWS: Partially revert edit from c9f1ad2a870 "Revive option
erc-query-on-unjoined-chan-privmsg".
* lisp/erc/erc-netsplit.el (erc-netsplit-JOIN): Silence byte compiler
warning re ignored return value from `delete' when removing nicks.
Could probably suppress rather than reconstitute since the CAR of an
`erc-netsplit-list' entry originates from the trailing "reason" param
of the instigating "QUIT" command and should look something like
"irc.example.org chat.example.org", which cannot be confused for a
nickname.
* test/lisp/erc/resources/erc-scenarios-common.el: Fix wording in
Commentary.

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 1aa445c5b9c53058de59c6b37f2504a1b89ddc98..d257bdcbf512f2e9dfc96cf6f5567f03a6252e2a 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -366,8 +366,8 @@ In an effort to help further tame ERC's complexity, the variable
 'erc-default-recipients' is now expected to hold but a single target.
 As a consequence, functions like 'erc-add-default-channel' that
 imagine an alternate, aspirational model of buffer-target relations
-have been deprecated.  Grep for their names in ChangeLog.4 for
-details.
+have been deprecated.  For specifics, see entries in Emacs'
+ChangeLog.4 from around June 30, 2022.
 
 A number of less consequential deprecations also debut in this
 release.  For example, the function 'erc-auto-query' was deemed too

diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index f3572014f27a6a80ac54f536c3fa1670ee5d8311..5dd11ab18694d6fad9be1143873ce21c99680629 100644 (file)
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -117,7 +117,9 @@ join from that split has been detected or not.")
                   parsed 'notice (process-buffer proc)
                   'netjoin-done ?s (car elt))
                  (setq erc-netsplit-list (delq elt erc-netsplit-list)))
-             (delete nick elt))
+              ;; Avoid `ignored-return-value' warning for `delete'.
+              (let ((tail (nthcdr 2 elt))) ; (t n1 ... nN)
+                (setcdr tail (delete nick (cdr tail)))))
            (setq no-next-hook t))))
     no-next-hook))
 

diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el
index f259c88594b49f03b2196b82c12a6471dd4f6ac4..32e7556d6024b3086edc407f4f38f0c27a4cc6d2 100644 (file)
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -51,7 +51,7 @@
 ;; argument, a `let*'-style VAR-LIST.  Relying on such a macro is
 ;; unfortunate because in many ways it actually hampers readability by
 ;; favoring magic over verbosity.  But without it (or something
-;; similar), any failing test would cause all subsequent tests in this
+;; similar), any failing test would cause all subsequent tests in a
 ;; file to fail like dominoes (making all but the first backtrace
 ;; useless).
 ;;