[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] v2: Prevent ERC from sending spurious PART messages
From: |
Victor J. Orlikowski |
Subject: |
[PATCH] v2: Prevent ERC from sending spurious PART messages |
Date: |
Thu, 30 Mar 2017 18:56:23 -0400 |
User-agent: |
Notmuch/0.22.2 (http://notmuchmail.org) Emacs/25.1.1 (x86_64-apple-darwin15.6.0) |
In the existing code, ERC can send a spurious PART message to the
server, if a given channel has already been closed, through the
operation of erc-channel-hook. The following patch ensures that
erc-channel-hook checks to see that the channel is still live,
before sending the PART message.
This revised version of my initial patch uses the clearer "when"
rather than "(unless (not))".
>From aae0ca46992337e9d27e85272e52e671ccd5e205 Mon Sep 17 00:00:00 2001
From: "Victor J. Orlikowski" <address@hidden>
Date: Thu, 30 Mar 2017 18:53:15 -0400
Subject: [PATCH 4/4] Prevent erc-kill-channel from sending spurious PART
messages if channel is not active.
---
lisp/erc/erc.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 488404d..fca19de 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6735,9 +6735,10 @@ This function should be on `erc-kill-server-hook'."
This function should be on `erc-kill-channel-hook'."
(when (erc-server-process-alive)
(let ((tgt (erc-default-target)))
- (erc-server-send (format "PART %s :%s" tgt
- (funcall erc-part-reason nil))
- nil tgt))))
+ (when tgt
+ (erc-server-send (format "PART %s :%s" tgt
+ (funcall erc-part-reason nil))
+ nil tgt)))))
;;; Dealing with `erc-parsed'
--
2.10.1 (Apple Git-78)
Best,
Victor
--
Victor J. Orlikowski <> address@hidden