Mercurial > emacs

diff lisp/erc/erc-join.el @ 69942:45937d0cd26d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208 Creator: Michael Olson <mwolson@gnu.org> Sync from erc--emacs--0
author Miles Bader <miles@gnu.org>
date Tue, 11 Apr 2006 22:09:49 +0000
parents 7010bb070445
children 7a3f13e2dd57
line wrap: on
line diff
--- a/lisp/erc/erc-join.el	Tue Apr 11 21:46:26 2006 +0000
+++ b/lisp/erc/erc-join.el	Tue Apr 11 22:09:49 2006 +0000
@@ -92,7 +92,7 @@
 		   (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 @@
 		   (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