From MAILER-DAEMON Thu May 29 14:30:25 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1K1mtN-0002Fh-92
	for mharc-erc-commit@gnu.org; Thu, 29 May 2008 14:30:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K1mtL-0002Er-Ii
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K1mtK-0002E7-3Q
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:23 -0400
Received: from [199.232.76.173] (port=55955 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K1mtJ-0002Dw-M7
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:21 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:45669)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1K1mtJ-000888-Ct
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1K1mtI-000403-4l
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:20 -0400
Received: from localhost ([127.0.0.1] helo=mire.hcoop.net ident=mwolson)
	by mire.hcoop.net with smtp (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1K1mtA-0003nN-Cc
	for erc-commit@gnu.org; Thu, 29 May 2008 14:30:13 -0400
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 29 May 2008 14:30:12 -0400
Date: Thu, 29 May 2008 14:30:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1K1mtA-0003nN-Cc@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-services.el: Updated freenode's
	NickServ regexps.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 May 2008 18:30:23 -0000

commit 44670c073275d4b9e3c74c063742c8ad05780b8b
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu May 29 20:29:04 2008 +0200

    erc-services.el: Updated freenode's NickServ regexps.
    
    * erc-services.el (erc-nickserv-alist): Updated REGEXP and
    SUCCESS-REGEXP for freenode.

diff --git a/ChangeLog b/ChangeLog
index 84f382d..ee1699b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-services.el (erc-nickserv-alist): Updated REGEXP and
+	SUCCESS-REGEXP for freenode.
+
 2008-04-26  Johan Bockgård  <bojohan@gnu.org>
 
 	* erc.el (erc-put-text-properties): Don't use mapcar*.
diff --git a/erc-services.el b/erc-services.el
index b25a10d..d3eb8d0 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -234,10 +234,11 @@ Example of use:
      "NickServ!NickServ@services."
      ;; freenode also accepts a password at login, see the `erc'
      ;; :password argument.
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
+     "This\\s-nickname\\s-is\\s-registered.\\s-Please\\s-choose"
      "NickServ"
      "IDENTIFY" nil nil
-     "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized")
+     ;; See also the 901 response code message.
+     "You\\s-are\\s-now\\s-identified\\s-for\\s-")
     (GalaxyNet
      "NS!nickserv@galaxynet.org"
      "Please\\s-change\\s-nicks\\s-or\\s-authenticate."



From MAILER-DAEMON Fri May 30 13:20:43 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1K28HS-0005yj-Ty
	for mharc-erc-commit@gnu.org; Fri, 30 May 2008 13:20:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K28HR-0005ye-T7
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K28HQ-0005yL-7J
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:41 -0400
Received: from [199.232.76.173] (port=41211 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K28HQ-0005yI-4H
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:40 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:46115)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1K28HP-0007oq-OB
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:39 -0400
Received: from [69.90.123.68] (helo=mire.hcoop.net ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1K28HO-0000WF-GM
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:38 -0400
Received: from localhost ([127.0.0.1] helo=mire.hcoop.net ident=mwolson)
	by mire.hcoop.net with smtp (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1K28HC-0001ok-DZ
	for erc-commit@gnu.org; Fri, 30 May 2008 13:20:27 -0400
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 30 May 2008 13:20:26 -0400
Date: Fri, 30 May 2008 13:20:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1K28HC-0001ok-DZ@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Handle freenode's new 328 channel URL
	response message.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 May 2008 17:20:42 -0000

commit 0e130a7e892831ff3f0f8359b570b2af3a077020
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Fri May 30 19:17:34 2008 +0200

    Handle freenode's new 328 channel URL response message.
    
    * erc-backend.el (328): New response handler.
    
    * erc.el (english): Added 328 to catalog.

diff --git a/ChangeLog b/ChangeLog
index ee1699b..b575b47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-30  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (328): New response handler.
+
+	* erc.el (english): Added 328 to catalog.
+
 2008-05-29  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-services.el (erc-nickserv-alist): Updated REGEXP and
diff --git a/erc-backend.el b/erc-backend.el
index 1bb3e4a..3acc0a0 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1686,6 +1686,13 @@ See `erc-display-server-message'." nil
      parsed 'notice (erc-get-buffer channel proc)
      's324 ?c channel ?m modes)))
 
+(define-erc-response-handler (328)
+  "Channel URL (on freenode network)." nil
+  (let ((channel (second (erc-response.command-args parsed)))
+        (url (erc-response.contents parsed)))
+    (erc-display-message parsed 'notice (erc-get-buffer channel proc)
+                         's328 ?c channel ?u url)))
+
 (define-erc-response-handler (329)
   "Channel creation date." nil
   (let ((channel (second (erc-response.command-args parsed)))
diff --git a/erc.el b/erc.el
index ca25be9..57ddb5a 100644
--- a/erc.el
+++ b/erc.el
@@ -6305,6 +6305,7 @@ All windows are opened in the current frame."
    (s321   . "Channel  Users  Topic")
    (s322   . "%c [%u] %t")
    (s324   . "%c modes: %m")
+   (s328   . "%c URL: %u")
    (s329   . "%c was created on %t")
    (s330   . "%n %a %i")
    (s331   . "No topic is set for %c")



