diff options
| author | Miles Bader <miles@gnu.org> | 2006-04-11 22:09:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-04-11 22:09:49 +0000 |
| commit | 067a09d2dbff4cddd0b6d13b9a5ce02334076c73 (patch) | |
| tree | 721e801154716f57eeb16f70cd13e370561ba183 /lisp/erc/erc-join.el | |
| parent | 8e5adad20c3d18a6232e84270534a96996189006 (diff) | |
| download | emacs-067a09d2dbff4cddd0b6d13b9a5ce02334076c73.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator: Michael Olson <mwolson@gnu.org>
Sync from erc--emacs--0
Diffstat (limited to 'lisp/erc/erc-join.el')
| -rw-r--r-- | lisp/erc/erc-join.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 0d2c1f98706..86b79c538f1 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -92,7 +92,7 @@ servers, presumably in the same domain." (or erc-server-announced-name erc-session-server)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only - (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) + (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) (setq server (match-string 1 server))) (let ((elem (assoc server erc-autojoin-channels-alist))) (if elem @@ -115,7 +115,7 @@ servers, presumably in the same domain." (or erc-server-announced-name erc-session-server)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only - (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) + (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) (setq server (match-string 1 server))) (let ((elem (assoc server erc-autojoin-channels-alist))) (when elem |