[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 5049827: Don't join erc channels doubly
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 5049827: Don't join erc channels doubly |
Date: |
Sun, 27 Dec 2015 19:26:29 +0000 |
branch: emacs-25
commit 504982765cc563d96a0b773f4cf183ceacaf5861
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Don't join erc channels doubly
* erc-join.el (erc-autojoin-channels): Don't join channels
more than once (if you have several nicks) (bug#20695).
---
lisp/erc/erc-join.el | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 4c99898..c1ce14a 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -156,7 +156,13 @@ This function is run from `erc-nickserv-identified-hook'."
(dolist (l erc-autojoin-channels-alist)
(when (string-match (car l) server)
(dolist (chan (cdr l))
- (erc-server-join-channel server chan)))))
+ (let ((buffer (erc-get-buffer chan)))
+ ;; Only auto-join the channels that we aren't already in
+ ;; using a different nick.
+ (when (or (not buffer)
+ (not (with-current-buffer buffer
+ (erc-server-process-alive))))
+ (erc-server-join-channel server chan)))))))
;; Return nil to avoid stomping on any other hook funcs.
nil)
@@ -170,7 +176,7 @@ This function is run from `erc-nickserv-identified-hook'."
(password (if (functionp secret)
(funcall secret)
secret)))
- (erc-server-send (concat "join " channel
+ (erc-server-send (concat "JOIN " channel
(if password
(concat " " password)
"")))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 5049827: Don't join erc channels doubly,
Lars Ingebrigtsen <=