aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran Litterio2017-04-17 20:30:40 -0400
committerGlenn Morris2017-04-17 20:30:40 -0400
commit4ad6be65f68a5c875ecbaa9e66d8ced28f43670a (patch)
tree95cd7494e3af26cd0dda1b030a7fff5afb9a0283
parent2d42bf7f5e57001a836b7b4e6303fac9d3f00a1d (diff)
downloademacs-4ad6be65f68a5c875ecbaa9e66d8ced28f43670a.tar.gz
emacs-4ad6be65f68a5c875ecbaa9e66d8ced28f43670a.zip
Small erc-kill-channel fix (bug#23700)
* lisp/erc/erc.el (erc-kill-channel): Handle null erc-default-target.
-rw-r--r--lisp/erc/erc.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 488404d7341..7e19ebbf980 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6735,9 +6735,10 @@ This function should be on `erc-kill-server-hook'."
6735This function should be on `erc-kill-channel-hook'." 6735This function should be on `erc-kill-channel-hook'."
6736 (when (erc-server-process-alive) 6736 (when (erc-server-process-alive)
6737 (let ((tgt (erc-default-target))) 6737 (let ((tgt (erc-default-target)))
6738 (erc-server-send (format "PART %s :%s" tgt 6738 (if tgt
6739 (funcall erc-part-reason nil)) 6739 (erc-server-send (format "PART %s :%s" tgt
6740 nil tgt)))) 6740 (funcall erc-part-reason nil))
6741 nil tgt)))))
6741 6742
6742;;; Dealing with `erc-parsed' 6743;;; Dealing with `erc-parsed'
6743 6744