]> git.eshelyaron.com Git - emacs.git/commitdiff
Make ERC respect erc-channel-hide-list
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 28 Oct 2019 14:31:39 +0000 (15:31 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 28 Oct 2019 14:31:39 +0000 (15:31 +0100)
* 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

index 1c5ecf99c6b660061a943573df978af5ec93d4a3..daf93f1cc9f5be25f008a5ad2601a5ae92646b93 100644 (file)
@@ -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)))))