*** empty log message ***

[gnu-emacs] / lisp / erc / erc-join.el

diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 0d2c1f98706d128a41d83d7fa210409d1b9e6cdc..2b22ef84e325d32d0ec3282814d8873e35668675 100644 (file)
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: irc
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -92,7 +90,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 +113,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