diff options
| author | Lars Ingebrigtsen | 2019-10-28 15:31:39 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-10-28 15:31:39 +0100 |
| commit | 925872ee7b2f56d643a57a160517c2c27e71879e (patch) | |
| tree | 12dcfe8c66a8c87c35fce29ff70e97b0d7805749 | |
| parent | 4367c296cead5540acf7804b1b7423d7fe649e53 (diff) | |
| download | emacs-925872ee7b2f56d643a57a160517c2c27e71879e.tar.gz emacs-925872ee7b2f56d643a57a160517c2c27e71879e.zip | |
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.
| -rw-r--r-- | lisp/erc/erc.el | 8 |
1 files 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' | |||
| 2693 | returns non-nil." | 2693 | returns non-nil." |
| 2694 | (let* ((command (erc-response.command parsed)) | 2694 | (let* ((command (erc-response.command parsed)) |
| 2695 | (sender (car (erc-parse-user (erc-response.sender parsed)))) | 2695 | (sender (car (erc-parse-user (erc-response.sender parsed)))) |
| 2696 | (channel (nth 1 (erc-response.command-args parsed))) | 2696 | (channel (car (erc-response.command-args parsed))) |
| 2697 | (network (or (and (fboundp 'erc-network-name) (erc-network-name)) | 2697 | (network (or (and (fboundp 'erc-network-name) (erc-network-name)) |
| 2698 | (erc-shorten-server-name | 2698 | (erc-shorten-server-name |
| 2699 | (or erc-server-announced-name | 2699 | (or erc-server-announced-name |
| @@ -2702,9 +2702,9 @@ returns non-nil." | |||
| 2702 | (when erc-network-hide-list | 2702 | (when erc-network-hide-list |
| 2703 | (erc-add-targets network erc-network-hide-list))) | 2703 | (erc-add-targets network erc-network-hide-list))) |
| 2704 | (current-hide-list | 2704 | (current-hide-list |
| 2705 | (apply 'append current-hide-list | 2705 | (append current-hide-list |
| 2706 | (when erc-channel-hide-list | 2706 | (when erc-channel-hide-list |
| 2707 | (erc-add-targets channel erc-channel-hide-list))))) | 2707 | (erc-add-targets channel erc-channel-hide-list))))) |
| 2708 | (or (member command erc-hide-list) | 2708 | (or (member command erc-hide-list) |
| 2709 | (member command current-hide-list) | 2709 | (member command current-hide-list) |
| 2710 | (and (member command erc-lurker-hide-list) (erc-lurker-p sender))))) | 2710 | (and (member command erc-lurker-hide-list) (erc-lurker-p sender))))) |