diff options
Diffstat (limited to 'lisp/erc/erc-join.el')
| -rw-r--r-- | lisp/erc/erc-join.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 83f7a045575..c292fdbd797 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -39,7 +39,7 @@ "Enable autojoining." :group 'erc) -;;;###autoload (autoload 'erc-autojoin-mode "erc-join" nil t) +;;;###autoload(autoload 'erc-autojoin-mode "erc-join" nil t) (define-erc-module autojoin nil "Makes ERC autojoin on connects and reconnects." ((add-hook 'erc-after-connect 'erc-autojoin-channels) @@ -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)))))))) @@ -215,6 +219,7 @@ This function is run from `erc-nickserv-identified-hook'." ;;; erc-join.el ends here ;; ;; Local Variables: +;; generated-autoload-file: "erc-loaddefs.el" ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: |