From 925872ee7b2f56d643a57a160517c2c27e71879e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 28 Oct 2019 15:31:39 +0100 Subject: [PATCH] Make ERC respect erc-channel-hide-list * lisp/erc/erc.el (erc-hide-current-message-p): Make erc-channel-hide-list work (bug#37879) by getting matching on the channel name instead of the ERC client name. --- lisp/erc/erc.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 1c5ecf99c6b..daf93f1cc9f 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2693,7 +2693,7 @@ is a member of `erc-lurker-hide-list' are hidden if `erc-lurker-p' returns non-nil." (let* ((command (erc-response.command parsed)) (sender (car (erc-parse-user (erc-response.sender parsed)))) - (channel (nth 1 (erc-response.command-args parsed))) + (channel (car (erc-response.command-args parsed))) (network (or (and (fboundp 'erc-network-name) (erc-network-name)) (erc-shorten-server-name (or erc-server-announced-name @@ -2702,9 +2702,9 @@ returns non-nil." (when erc-network-hide-list (erc-add-targets network erc-network-hide-list))) (current-hide-list - (apply 'append current-hide-list - (when erc-channel-hide-list - (erc-add-targets channel erc-channel-hide-list))))) + (append current-hide-list + (when erc-channel-hide-list + (erc-add-targets channel erc-channel-hide-list))))) (or (member command erc-hide-list) (member command current-hide-list) (and (member command erc-lurker-hide-list) (erc-lurker-p sender))))) -- 2.39.5