; 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.

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index f3572014f27..5dd11ab1869 100644
--- 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))