diff options
| author | F. Jason Park <jp@neverwas.me> | 2023-05-18 23:47:27 -0700 |
|---|---|---|
| committer | F. Jason Park <jp@neverwas.me> | 2023-05-21 18:59:33 -0700 |
| commit | 8120f5156ccfa0e4992685a05abcb4838d76fb8a (patch) | |
| tree | d456fc79a593ae1b0d3f69344b5921e61ef391e5 | |
| parent | 71622d70e8bd0f4289df098a8d9b3ab06f4bdcc0 (diff) | |
; 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.
| -rw-r--r-- | etc/ERC-NEWS | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-netsplit.el | 4 | ||||
| -rw-r--r-- | test/lisp/erc/resources/erc-scenarios-common.el | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 1aa445c5b9c..d257bdcbf51 100644 --- 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 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)) diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el index f259c88594b..32e7556d602 100644 --- 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). ;; |