[Emacs-diffs] master 63b29f8: Autojoin channels with same name on different servers in erc

[Lars Ingebrigtsen]

branch: master
commit 63b29f81075a3fdca70348f023d3ebb37a4f2a63
Author: Martin Kletzander <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Autojoin channels with same name on different servers in erc
    
    * lisp/erc/erc-join.el (erc-autojoin-channels): Join channels with
    the same name on different servers (bug#32723).
    
    Copyright-paperwork-exempt: yes
---
 lisp/erc/erc-join.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 896521e..c292fdb 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -161,6 +161,10 @@ This function is run from `erc-nickserv-identified-hook'."
              ;; Only auto-join the channels that we aren't already in
              ;; using a different nick.
              (when (or (not buffer)
+                       ;; If the same channel is joined on another
+                       ;; server the best-effort is to just join
+                       (not (string-match (car l)
+                                          (process-name erc-server-process)))
                        (not (with-current-buffer buffer
                               (erc-server-process-alive))))
                (erc-server-join-channel server chan))))))))