From MAILER-DAEMON Wed Dec 05 00:20:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IzmgC-0003GJ-LF
	for mharc-erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IzmgA-0003Dz-A7
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Izmg7-0003DK-Rl
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Izmg7-0003DH-Ls
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:11 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1Izmg7-0000FX-CE
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:11 -0500
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 1Izmg6-0003HK-N8
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:10 -0500
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 1Izmg4-0003Fr-SZ
	for erc-commit@gnu.org; Wed, 05 Dec 2007 00:20:10 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 05 Dec 2007 00:20:08 -0500
Date: Wed, 05 Dec 2007 00:20:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1Izmg4-0003Fr-SZ@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Move definition of a function to get
	rid of byte-compiler warning
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: Wed, 05 Dec 2007 05:20:14 -0000

commit 356094a638d0a30d1d80beca983e38eb7ddfc527
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Dec 4 19:50:14 2007 -0500

    Move definition of a function to get rid of byte-compiler warning

diff --git a/ChangeLog b/ChangeLog
index cf96f33..b790e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-01  Glenn Morris  <rgm@gnu.org>
+
+	* erc-backend.el (erc-server-send-ping): Move after definition of
+	erc-server-send.
+
 2007-11-29  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
 	* erc-backend.el, erc.el:
diff --git a/erc-backend.el b/erc-backend.el
index 338696f..c0f4205 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -461,27 +461,6 @@ Currently this is called by `erc-send-input'."
     (upcase-word 1)
     (buffer-string)))
 
-(defun erc-server-send-ping (buf)
-  "Send a ping to the IRC server buffer in BUF.
-Additionally, detect whether the IRC process has hung."
-  (if (buffer-live-p buf)
-      (with-current-buffer buf
-        (if (and erc-server-send-ping-timeout
-                 (>
-                  (erc-time-diff (erc-current-time)
-                                 erc-server-last-received-time)
-                  erc-server-send-ping-timeout))
-            (progn
-              ;; if the process is hung, kill it
-              (setq erc-server-timed-out t)
-              (delete-process erc-server-process))
-          (erc-server-send (format "PING %.0f" (erc-current-time)))))
-    ;; remove timer if the server buffer has been killed
-    (let ((timer (assq buf erc-server-ping-timer-alist)))
-      (when timer
-        (erc-cancel-timer (cdr timer))
-        (setcdr timer nil)))))
-
 (defun erc-server-setup-periodical-ping (buffer)
   "Set up a timer to periodically ping the current server.
 The current buffer is given by BUFFER."
@@ -775,6 +754,27 @@ protection algorithm."
       (message "ERC: No process running")
       nil)))
 
+(defun erc-server-send-ping (buf)
+  "Send a ping to the IRC server buffer in BUF.
+Additionally, detect whether the IRC process has hung."
+  (if (buffer-live-p buf)
+      (with-current-buffer buf
+        (if (and erc-server-send-ping-timeout
+                 (>
+                  (erc-time-diff (erc-current-time)
+                                 erc-server-last-received-time)
+                  erc-server-send-ping-timeout))
+            (progn
+              ;; if the process is hung, kill it
+              (setq erc-server-timed-out t)
+              (delete-process erc-server-process))
+          (erc-server-send (format "PING %.0f" (erc-current-time)))))
+    ;; remove timer if the server buffer has been killed
+    (let ((timer (assq buf erc-server-ping-timer-alist)))
+      (when timer
+        (erc-cancel-timer (cdr timer))
+        (setcdr timer nil)))))
+
 ;; From Circe
 (defun erc-server-send-queue (buffer)
   "Send messages in `erc-server-flood-queue'.



From MAILER-DAEMON Fri Dec 07 16:30:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J0km1-0005oN-EK
	for mharc-erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J0kly-0005nL-Df
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J0klt-0005lg-LP
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J0klt-0005ld-G1
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:09 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J0klt-00026m-FE
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:09 -0500
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 1J0kls-0005Dy-AF
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:08 -0500
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 1J0klr-0000t9-1H
	for erc-commit@gnu.org; Fri, 07 Dec 2007 16:30:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 07 Dec 2007 16:30:07 -0500
Date: Fri, 07 Dec 2007 16:30:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J0klr-0000t9-1H@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] New "successful identification" hook
	in erc-services.el.
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, 07 Dec 2007 21:30:15 -0000

commit 49c48a2a9a5ef027435edfb664310f9688f4f903
Author: Edward O'Connor <hober0@gmail.com>
Date:   Fri Dec 7 13:23:09 2007 -0800

    New "successful identification" hook in erc-services.el.

diff --git a/ChangeLog b/ChangeLog
index b790e6e..e789fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-07  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-services.el: Provide a hook that runs when nickserv confirms
+	that the user has successfully identified.
+	(services, erc-nickserv-identify-mode): Add and remove
+	erc-nickserv-identification-autodetect from
+	erc-server-NOTICE-functions.
+	(erc-nickserv-alist): Add SUCCESS-REGEXP to each entry.
+	(erc-nickserv-alist-identified-regexp)
+	(erc-nickserv-identification-autodetect): New functions.
+	(erc-nickserv-identified-hook): New hook.
+
 2007-12-01  Glenn Morris  <rgm@gnu.org>
 
 	* erc-backend.el (erc-server-send-ping): Move after definition of
diff --git a/erc-services.el b/erc-services.el
index e6f6c40..6cf21e8 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -109,7 +109,9 @@ You can also use M-x erc-nickserv-identify-mode to change modes."
    (remove-hook 'erc-after-connect
 		'erc-nickserv-identify-on-connect)
    (remove-hook 'erc-nick-changed-functions
-		'erc-nickserv-identify-on-nick-change)))
+		'erc-nickserv-identify-on-nick-change)
+   (remove-hook 'erc-server-NOTICE-functions
+		'erc-nickserv-identification-autodetect)))
 
 ;;;###autoload
 (defun erc-nickserv-identify-mode (mode)
@@ -118,6 +120,8 @@ You can also use M-x erc-nickserv-identify-mode to change modes."
    (list (intern (completing-read
 		  "Choose Nickserv identify mode (RET to disable): "
 		  '(("autodetect") ("nick-change") ("both")) nil t))))
+  (add-hook 'erc-server-NOTICE-functions
+	    'erc-nickserv-identification-autodetect)
   (cond ((eq mode 'autodetect)
 	 (setq erc-nickserv-identify-mode 'autodetect)
 	 (add-hook 'erc-server-NOTICE-functions
@@ -149,7 +153,9 @@ You can also use M-x erc-nickserv-identify-mode to change modes."
 	 (remove-hook 'erc-after-connect
 		      'erc-nickserv-identify-on-connect)
 	 (remove-hook 'erc-nick-changed-functions
-		      'erc-nickserv-identify-on-nick-change))))
+		      'erc-nickserv-identify-on-nick-change)
+	 (remove-hook 'erc-server-NOTICE-functions
+		      'erc-nickserv-identification-autodetect))))
 
 (defcustom erc-prompt-for-nickserv-password t
   "Ask for the password when identifying to NickServ."
@@ -192,63 +198,64 @@ Example of use:
   '((Ars
      nil nil
      "Census"
-     "IDENTIFY" nil nil)
+     "IDENTIFY" nil nil nil)
     (Austnet
      "NickOP!service@austnet.org"
      "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
      "nickop@austnet.org"
-     "identify" nil nil)
+     "identify" nil nil nil)
     (Azzurra
      "NickServ!service@azzurra.org"
      "/ns\\s-IDENTIFY\\s-password"
      "NickServ"
-     "IDENTIFY" nil nil)
+     "IDENTIFY" nil nil nil)
     (BitlBee
      nil nil
      "&bitlbee"
-     "identify" nil nil)
+     "identify" nil nil nil)
     (BRASnet
      "NickServ!services@brasnet.org"
      "/NickServ\\s-IDENTIFY\\s-senha"
      "NickServ"
-     "IDENTIFY" nil "")
+     "IDENTIFY" nil "" nil)
     (DALnet
      "NickServ!service@dal.net"
      "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
      "NickServ@services.dal.net"
-     "IDENTIFY" nil nil)
+     "IDENTIFY" nil nil nil)
     (freenode
      "NickServ!NickServ@services."
      "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
      "NickServ"
-     "IDENTIFY" nil nil)
+     "IDENTIFY" nil nil
+     "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized")
     (GalaxyNet
      "NS!nickserv@galaxynet.org"
      "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
      "NS@services.galaxynet.org"
-     "AUTH" t nil)
+     "AUTH" t nil nil)
     (iip
      "Trent@anon.iip"
      "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
      "Trent@anon.iip"
-     "IDENTIFY" nil "SQUERY")
+     "IDENTIFY" nil "SQUERY" nil)
     (OFTC
      "NickServ!services@services.oftc.net"
      "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
      "NickServ"
-     "IDENTIFY" nil nil)
+     "IDENTIFY" nil nil nil)
     (QuakeNet
      nil nil
      "Q@CServe.quakenet.org"
-     "auth" t nil)
+     "auth" t nil nil)
     (SlashNET
      "NickServ!services@services.slashnet.org"
      "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
      "NickServ@services.slashnet.org"
-     "IDENTIFY" nil nil))
+     "IDENTIFY" nil nil nil))
    "Alist of NickServer details, sorted by network.
 Every element in the list has the form
-  \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
+  \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER SUCCESS-REGEXP)
 
 SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'.
 NICKSERV is the description of the nickserv in the form nick!user@host.
@@ -258,7 +265,9 @@ KEYWORD is the keyword to use in the reply message to identify yourself.
 USE-CURRENT indicates whether the current nickname must be used when
   identifying.
 ANSWER is the command to use for the answer.  The default is 'privmsg.
-  This last element is optional."
+SUCCESS-REGEXP is a regular expression matching the message nickserv
+  sends when you've successfully identified.
+The last two elements are optional."
    :group 'erc-services
    :type '(repeat
 	   (list :tag "Nickserv data"
@@ -292,8 +301,36 @@ ANSWER is the command to use for the answer.  The default is 'privmsg.
 (defsubst erc-nickserv-alist-ident-command (network &optional entry)
   (nth 6 (or entry (assoc network erc-nickserv-alist))))
 
+(defsubst erc-nickserv-alist-identified-regexp (network &optional entry)
+  (nth 7 (or entry (assoc network erc-nickserv-alist))))
+
 ;; Functions:
 
+(defcustom erc-nickserv-identified-hook nil
+  "Run this hook when NickServ acknowledged successful identification.
+Hooks are called with arguments (NETWORK NICK)."
+  :group 'erc-services
+  :type 'hook)
+
+(defun erc-nickserv-identification-autodetect (proc parsed)
+  "Check for NickServ's successful identification notice.
+Make sure it is the real NickServ for this network and that it has
+specifically confirmed a successful identification attempt.
+If this is the case, run `erc-nickserv-identified-hook'."
+  (let* ((network (erc-network))
+	 (sender (erc-nickserv-alist-sender network))
+	 (success-regex (erc-nickserv-alist-identified-regexp network))
+	 (sspec (erc-response.sender parsed))
+	 (nick (car (erc-response.command-args parsed)))
+	 (msg (erc-response.contents parsed)))
+    ;; continue only if we're sure it's the real nickserv for this network
+    ;; and it's told us we've successfully identified
+    (when (and sender (equal sspec sender)
+	       (string-match success-regex msg))
+      (erc-log "NickServ IDENTIFY success notification detected")
+      (run-hook-with-args 'erc-nickserv-identified-hook network nick)
+      nil)))
+
 (defun erc-nickserv-identify-autodetect (proc parsed)
   "Check for a NickServ identify request everytime a notice is received.
 Make sure it is the real NickServ for this network and that it has



From MAILER-DAEMON Sun Dec 09 02:00:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9E-0008Ig-Mv
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9C-0008IM-VO
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9B-0008Hq-Cx
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9B-0008Hh-4S
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:17 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9A-0000Zh-W4
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:17 -0500
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 1J1G98-0004OM-J5
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:14 -0500
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 1J1G97-0007ue-1U
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:14 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:13 -0500
Date: Sun, 09 Dec 2007 02:00:13 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G97-0007ue-1U@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Parse 275 (using ssl connection)
	response
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: Sun, 09 Dec 2007 07:00:19 -0000

commit 14a4a79fbd60c30dbcd5b9c17dc586a3be562ac0
Author: Giorgos Keramidas <keramida@ceid.upatras.gr>
Date:   Sun Dec 9 02:27:25 2007 +0200

    Parse 275 (using ssl connection) response
    
    * erc-backend.el, erc.el:
      Parse 275 (secure connection) responses.

diff --git a/ChangeLog b/ChangeLog
index e789fd2..e9f8754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-09  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* erc-backend.el, erc.el:
+	Parse 275 (secure connection) responses.
+
 2007-12-07  Edward O'Connor  <ted@oconnor.cx>
 
 	* erc-services.el: Provide a hook that runs when nickserv confirms
diff --git a/erc-backend.el b/erc-backend.el
index c0f4205..2117163 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1538,6 +1538,16 @@ A server may send more than one 005 message."
 See `erc-display-server-message'." nil
   (erc-display-server-message proc parsed))
 
+(define-erc-response-handler (275)
+  "Display secure connection message." nil
+  (multiple-value-bind (nick user message)
+      (cdr (erc-response.command-args parsed))
+    (erc-display-message
+     parsed 'notice 'active 's275
+     ?n nick
+     ?m (mapconcat 'identity (cddr (erc-response.command-args parsed))
+                   " "))))
+
 (define-erc-response-handler (290)
   "Handle dancer-ircd CAPAB messages." nil nil)
 
diff --git a/erc.el b/erc.el
index 209a416..fb783ce 100644
--- a/erc.el
+++ b/erc.el
@@ -6203,6 +6203,7 @@ All windows are opened in the current frame."
    (s252   . "%i operator(s) online")
    (s253   . "%i unknown connection(s)")
    (s254   . "%i channels formed")
+   (s275   . "%n %m")
    (s301   . "%n is AWAY: %r")
    (s303   . "Is online: %n")
    (s305   . "%m")



From MAILER-DAEMON Sun Dec 09 02:00:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9I-0008KO-4o
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9G-0008Jz-Qf
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9F-0008JN-Qr
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9F-0008JG-Gv
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:21 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9F-0000aN-6H
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:21 -0500
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 1J1G9E-0004OY-F3
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:20 -0500
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 1J1G9C-0007y8-TV
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:19 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:18 -0500
Date: Sun, 09 Dec 2007 02:00:18 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G9C-0007y8-TV@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Sync message and error string fixes
	from Emacs
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: Sun, 09 Dec 2007 07:00:23 -0000

commit 170e591d30e04425dac5b1c56a7771eb6bed533b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Dec 8 21:53:07 2007 -0500

    Sync message and error string fixes from Emacs

diff --git a/ChangeLog b/ChangeLog
index e9f8754..bbda56c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 	* erc-backend.el, erc.el:
 	Parse 275 (secure connection) responses.
 
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+	* erc-stamp.el (erc-echo-timestamp):
+	* erc-lang.el (language):
+	* erc-backend.el (erc-server-connect): Fix buggy call to `message'.
+
 2007-12-07  Edward O'Connor  <ted@oconnor.cx>
 
 	* erc-services.el: Provide a hook that runs when nickserv confirms
@@ -15,6 +21,10 @@
 	(erc-nickserv-identification-autodetect): New functions.
 	(erc-nickserv-identified-hook): New hook.
 
+2007-12-06  D. Goel  <deego3@gmail.com>
+
+	* erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
+
 2007-12-01  Glenn Morris  <rgm@gnu.org>
 
 	* erc-backend.el (erc-server-send-ping): Move after definition of
diff --git a/erc-backend.el b/erc-backend.el
index 2117163..5d94408 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -515,7 +515,7 @@ We will store server variables in the buffer given by BUFFER."
       (set-process-filter process 'erc-server-filter-function)
       (set-process-buffer process buffer)))
   (erc-log "\n\n\n********************************************\n")
-  (message (erc-format-message
+  (message "%s" (erc-format-message
             'login ?n
             (with-current-buffer buffer (erc-current-nick))))
   ;; wait with script loading until we receive a confirmation (first
diff --git a/erc-lang.el b/erc-lang.el
index e61156f..b11721d 100644
--- a/erc-lang.el
+++ b/erc-lang.el
@@ -197,7 +197,7 @@ Normungsinstitut (ON), Postfach 130, A-1021 Vienna, Austria.")
   "Return the language name for the ISO CODE."
   (interactive (list (completing-read "ISO language code: "
 				      iso-638-languages)))
-  (message (cdr (assoc code iso-638-languages))))
+  (message "%s" (cdr (assoc code iso-638-languages))))
 
 (defun erc-cmd-LANG (language)
   "Display the language name for the language code given by LANGUAGE."
diff --git a/erc-match.el b/erc-match.el
index a475258..757ef66 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -299,7 +299,7 @@ Completion is performed on the optional alist COMPLETIONS."
 		(lambda (x)
 		  (not (erc-member-ignore-case (car x) (symbol-value list)))))))
     (if (erc-member-ignore-case entry (symbol-value list))
-	(error (format "\"%s\" is already on the list" entry))
+	(error "\"%s\" is already on the list" entry)
       (set list (cons entry (symbol-value list))))))
 
 (defun erc-remove-entry-from-list (list prompt)
diff --git a/erc-stamp.el b/erc-stamp.el
index 64b0405..ae9bb51 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -412,8 +412,8 @@ NOW is position of point currently."
   (when erc-echo-timestamps
     (let ((stamp (get-text-property now 'timestamp)))
       (when stamp
-	(message (format-time-string erc-echo-timestamp-format
-				     stamp))))))
+	(message "%s" (format-time-string erc-echo-timestamp-format
+					  stamp))))))
 
 (provide 'erc-stamp)
 



From MAILER-DAEMON Sun Dec 09 02:00:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9L-0008LO-AW
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:27 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9J-0008L2-LT
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:25 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9J-0008Kp-1m
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:25 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9I-0008Km-NI
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:24 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9I-0000av-Ic
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:24 -0500
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 1J1G9H-0004Oe-Mu
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:23 -0500
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 1J1G9G-0007zI-6D
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:23 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:22 -0500
Date: Sun, 09 Dec 2007 02:00:22 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G9G-0007zI-6D@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add identification hooks for GRnet,
	the Greek IRC network.
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: Sun, 09 Dec 2007 07:00:26 -0000

commit 3dd1a2deccb559588f543fc4b96c51e27a551405
Author: Giorgos Keramidas <keramida@ceid.upatras.gr>
Date:   Sun Dec 9 06:32:52 2007 +0200

    Add identification hooks for GRnet, the Greek IRC network.
    
    * erc-services.el: Add identification hooks for GRnet, the Greek
      IRC network <http://www.irc.gr>.

diff --git a/ChangeLog b/ChangeLog
index bbda56c..8975b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* erc-backend.el, erc.el:
 	Parse 275 (secure connection) responses.
 
+	* erc-services.el: Add identification hooks for GRnet, the Greek
+	IRC network <http://www.irc.gr>.
+
 2007-12-08  David Kastrup  <dak@gnu.org>
 
 	* erc-stamp.el (erc-echo-timestamp):
diff --git a/erc-services.el b/erc-services.el
index 6cf21e8..224b464 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -29,9 +29,10 @@
 ;; are made to test if NickServ is the real NickServ for a given network or
 ;; server.
 
-;; As a default, ERC has the data for the official nickname services on the
-;; networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, and Slashnet.
-;; You can add more by using M-x customize-variable RET erc-nickserv-alist.
+;; As a default, ERC has the data for the official nickname services on
+;; the networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, GRnet,
+;; and Slashnet.  You can add more by using M-x customize-variable RET
+;; erc-nickserv-alist.
 
 ;; Usage:
 ;;
@@ -182,6 +183,7 @@ Example of use:
 			(const DALnet)
 			(const freenode)
 			(const GalaxyNet)
+			(const GRnet)
 			(const iip)
 			(const OFTC)
 			(const QuakeNet)
@@ -234,6 +236,12 @@ Example of use:
      "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
      "NS@services.galaxynet.org"
      "AUTH" t nil nil)
+    (GRnet
+     "NickServ!service@irc.gr"
+     "This\\snickname\\sis\\sregistered\\sand\\sprotected."
+     "NickServ"
+     "IDENTIFY" nil nil
+     "Password\\saccepted\\s-\\syou\\sare\\snow\\srecognized.")
     (iip
      "Trent@anon.iip"
      "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"



From MAILER-DAEMON Sun Dec 09 02:00:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9E-0008Ip-Ts
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9D-0008IY-Dc
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9C-0008IA-78
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:19 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9C-0008I7-4g
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:18 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9C-0000a1-1g
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:18 -0500
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 1J1G9B-0004OS-2V
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:17 -0500
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 1J1G99-0007wB-IU
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:16 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:15 -0500
Date: Sun, 09 Dec 2007 02:00:15 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G99-0007wB-IU@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Bookkeeping
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: Sun, 09 Dec 2007 07:00:20 -0000

commit c3a64deaa7673d3be23cef234aa928e7c9a4dfa4
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Dec 8 21:10:38 2007 -0500

    Bookkeeping

diff --git a/CREDITS b/CREDITS
index 82645ac..502d9b2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -171,8 +171,8 @@ Aidan Kehoe  <kehoea AT parhasard DOT net>:
   * Fixed a bug with log buffers in XEmacs in erc-log.el (1 line changed).
 
 Giorgos Keramidas <keramida@ceid.upatras.gr>:
-  * Made a handler for 307 (nick has identified) responses
-    (6 lines changed).
+  * Made handlers for 307 (nick has identified) and
+    275 (using ssl connection) responses (12 lines changed).
 
 ----
 



From MAILER-DAEMON Sun Dec 09 02:00:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9Q-0008M7-Ez
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9O-0008Ln-DO
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9M-0008Lb-99
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:29 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9M-0008LY-1S
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:28 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9L-0000bV-Dj
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:28 -0500
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 1J1G9K-0004Ok-LN
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:26 -0500
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 1J1G9J-000800-6K
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:26 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:25 -0500
Date: Sun, 09 Dec 2007 02:00:25 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G9J-000800-6K@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-services.el (erc-nickserv-alist):
	Fix regexps for GRnet.
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: Sun, 09 Dec 2007 07:00:30 -0000

commit dedf54512ebb4fbd0bd11496348459c58c24eeb2
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Dec 9 01:34:38 2007 -0500

    erc-services.el (erc-nickserv-alist): Fix regexps for GRnet.

diff --git a/ChangeLog b/ChangeLog
index 8975b22..7f0cad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc-services.el (erc-nickserv-alist): Fix regexps for GRnet.
+
 2007-12-09  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
 	* erc-backend.el, erc.el:
diff --git a/erc-services.el b/erc-services.el
index 224b464..099166b 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -238,10 +238,10 @@ Example of use:
      "AUTH" t nil nil)
     (GRnet
      "NickServ!service@irc.gr"
-     "This\\snickname\\sis\\sregistered\\sand\\sprotected."
+     "This\\s-nickname\\s-is\\s-registered\\s-and\\s-protected."
      "NickServ"
      "IDENTIFY" nil nil
-     "Password\\saccepted\\s-\\syou\\sare\\snow\\srecognized.")
+     "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized.")
     (iip
      "Trent@anon.iip"
      "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"



From MAILER-DAEMON Sun Dec 09 02:00:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J1G9S-0008My-KY
	for mharc-erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:34 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J1G9R-0008MW-4U
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J1G9P-0008Lv-F5
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:32 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J1G9P-0008Ls-Af
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:31 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J1G9P-0000br-3e
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:31 -0500
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 1J1G9O-0004Oz-C7
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:30 -0500
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 1J1G9M-00080a-HK
	for erc-commit@gnu.org; Sun, 09 Dec 2007 02:00:29 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 09 Dec 2007 02:00:28 -0500
Date: Sun, 09 Dec 2007 02:00:28 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J1G9M-00080a-HK@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Bookkeeping
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: Sun, 09 Dec 2007 07:00:33 -0000

commit 4c2633676711f09e7790cd042c99e8a98390151b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Dec 9 01:35:32 2007 -0500

    Bookkeeping

diff --git a/CREDITS b/CREDITS
index 502d9b2..37110ea 100644
--- a/CREDITS
+++ b/CREDITS
@@ -172,7 +172,9 @@ Aidan Kehoe  <kehoea AT parhasard DOT net>:
 
 Giorgos Keramidas <keramida@ceid.upatras.gr>:
   * Made handlers for 307 (nick has identified) and
-    275 (using ssl connection) responses (12 lines changed).
+    275 (using ssl connection) responses.
+  * Added nickserv info for GRnet.
+  * 15 lines changed total.
 
 ----
 



From MAILER-DAEMON Thu Dec 13 16:00:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J2vAG-0004aZ-4t
	for mharc-erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J2vAE-0004XW-9J
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J2vAD-0004UZ-4r
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J2vAC-0004UI-WB
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:13 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J2vAC-0008E8-F6
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:12 -0500
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 1J2vAB-0000Nq-KY
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:11 -0500
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 1J2vA9-0001F2-V4
	for erc-commit@gnu.org; Thu, 13 Dec 2007 16:00:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 13 Dec 2007 16:00:09 -0500
Date: Thu, 13 Dec 2007 16:00:09 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J2vA9-0001F2-V4@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Doc fix for a lot of server response
	handlers.
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, 13 Dec 2007 21:00:14 -0000

commit 5761dfed840cdc68336c911047527452a1117b31
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Dec 13 21:59:59 2007 +0100

    Doc fix for a lot of server response handlers.
    
    * erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
    (312, 315, 319, 330, 331, 333, 367, 368, 391, 405, 406, 412)
    (421, 432, 433, 437, 442, 461, 474, 477, 482, 431): Doc fix.

diff --git a/ChangeLog b/ChangeLog
index 7f0cad3..be111fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-13  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
+	(312, 315, 319, 330, 331, 333, 367, 368, 391, 405, 406, 412)
+	(421, 432, 433, 437, 442, 461, 474, 477, 482, 431): Doc fix.
+
 2007-12-09  Michael Olson  <mwolson@gnu.org>
 
 	* erc-services.el (erc-nickserv-alist): Fix regexps for GRnet.
diff --git a/erc-backend.el b/erc-backend.el
index 5d94408..62b73f0 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1349,7 +1349,7 @@ add things to `%s' instead."
       (erc-update-mode-line))))
 
 (define-erc-response-handler (PRIVMSG NOTICE)
-  nil nil
+  "Handle private messages, including messages in channels." nil
   (let ((sender-spec (erc-response.sender parsed))
         (cmd (erc-response.command parsed))
         (tgt (car (erc-response.command-args parsed)))
@@ -1413,7 +1413,7 @@ add things to `%s' instead."
 (add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query)
 
 (define-erc-response-handler (QUIT)
-  nil nil
+  "Another user has quit IRC." nil
   (let ((reason (erc-response.contents parsed))
         bufs)
     (multiple-value-bind (nick login host)
@@ -1426,7 +1426,7 @@ add things to `%s' instead."
                            ?h host ?r reason))))
 
 (define-erc-response-handler (TOPIC)
-  nil nil
+  "The channel topic has changed." nil
   (let* ((ch (first (erc-response.command-args parsed)))
          (topic (erc-trim-string (erc-response.contents parsed)))
          (time (format-time-string "%T %m/%d/%y" (current-time))))
@@ -1439,7 +1439,7 @@ add things to `%s' instead."
                            ?c ch ?T topic))))
 
 (define-erc-response-handler (WALLOPS)
-  nil nil
+  "Display a WALLOPS message." nil
   (let ((message (erc-response.contents parsed)))
     (multiple-value-bind (nick login host)
         (erc-parse-user (erc-response.sender parsed))
@@ -1465,12 +1465,12 @@ add things to `%s' instead."
    (erc-response.contents parsed)))
 
 (define-erc-response-handler (376 422)
-  nil nil
+  "End of MOTD/MOTD is missing." nil
   (erc-server-MOTD proc parsed)
   (erc-connection-established proc parsed))
 
 (define-erc-response-handler (004)
-  nil nil
+  "Display the server's identification." nil
   (multiple-value-bind (server-name server-version)
       (cdr (erc-response.command-args parsed))
     (setq erc-server-version server-version)
@@ -1510,7 +1510,7 @@ A server may send more than one 005 message."
     (erc-display-message parsed 'notice proc line)))
 
 (define-erc-response-handler (221)
-  nil nil
+  "Display the current user modes." nil
   (let* ((nick (first (erc-response.command-args parsed)))
          (modes (mapconcat 'identity
                            (cdr (erc-response.command-args parsed)) " ")))
@@ -1596,7 +1596,7 @@ See `erc-display-server-message'." nil
        ?n nick ?f fname ?u user ?h host))))
 
 (define-erc-response-handler (312)
-  nil nil
+  "Server name response in WHOIS." nil
   (multiple-value-bind (nick server-host)
       (cdr (erc-response.command-args parsed))
     (erc-display-message
@@ -1614,7 +1614,7 @@ See `erc-display-server-message'." nil
   ;; 318 - End of WHOIS list
   ;; 323 - End of channel LIST
   ;; 369 - End of WHOWAS
-  nil nil
+  "End of WHO/WHOIS/LIST/WHOWAS notices." nil
   (ignore proc parsed))
 
 (define-erc-response-handler (317)
@@ -1635,7 +1635,7 @@ See `erc-display-server-message'." nil
        ?n nick ?i (erc-sec-to-time (string-to-number seconds-idle))))))
 
 (define-erc-response-handler (319)
-  nil nil
+  "Channel names in WHOIS response." nil
   (erc-display-message
    parsed 'notice 'active 's319
    ?n (second (erc-response.command-args parsed))
@@ -1683,7 +1683,7 @@ See `erc-display-server-message'." nil
      's329 ?c channel ?t (format-time-string "%A %Y/%m/%d %X" time))))
 
 (define-erc-response-handler (330)
-  nil nil
+  "Nick is authed as (on Quakenet network)." nil
   ;; FIXME: I don't know what the magic numbers mean.  Mummy, make
   ;; the magic numbers go away.
   ;; No seriously, I have no clue about the format of this command,
@@ -1699,10 +1699,9 @@ See `erc-display-server-message'." nil
                          ?n nick ?a authmsg ?i authaccount)))
 
 (define-erc-response-handler (331)
-  "Channel topic." nil
+  "No topic set for channel." nil
   (let ((channel (second (erc-response.command-args parsed)))
         (topic (erc-response.contents parsed)))
-    ;; FIXME: why don't we do anything with the topic? -- Lawrence 2004/05/10
     (erc-display-message parsed 'notice (erc-get-buffer channel proc)
                          's331 ?c channel)))
 
@@ -1715,8 +1714,7 @@ See `erc-display-server-message'." nil
                          's332 ?c channel ?T topic)))
 
 (define-erc-response-handler (333)
-  ;; Who set the topic, and when
-  nil nil
+  "Who set the topic, and when." nil
   (multiple-value-bind (channel nick time)
       (cdr (erc-response.command-args parsed))
     (setq time (format-time-string "%T %Y/%m/%d"
@@ -1766,7 +1764,7 @@ See `erc-display-server-message'." nil
     (erc-channel-end-receiving-names)))
 
 (define-erc-response-handler (367)
-  "Channel ban list entries" nil
+  "Channel ban list entries." nil
   (multiple-value-bind (channel banmask setter time)
       (cdr (erc-response.command-args parsed))
     ;; setter and time are not standard
@@ -1781,7 +1779,7 @@ See `erc-display-server-message'." nil
                            ?b banmask))))
 
 (define-erc-response-handler (368)
-  "End of channel ban list" nil
+  "End of channel ban list." nil
   (let ((channel (second (erc-response.command-args parsed))))
     (erc-display-message parsed 'notice 'active 's368
                          ?c channel)))
@@ -1797,7 +1795,7 @@ See `erc-display-server-message'." nil
                          's379 ?c from ?f to)))
 
 (define-erc-response-handler (391)
-  "Server's time string" nil
+  "Server's time string." nil
   (erc-display-message
    parsed 'notice 'active
    's391 ?s (second (erc-response.command-args parsed))
@@ -1824,56 +1822,47 @@ See `erc-display-server-message'." nil
 
 
 (define-erc-response-handler (405)
-  ;; Can't join that many channels.
-  nil nil
+  "Can't join that many channels." nil
   (erc-display-message parsed '(notice error) 'active
                        's405 ?c (second (erc-response.command-args parsed))))
 
 (define-erc-response-handler (406)
-  ;; No such nick
-  nil nil
+  "No such nick." nil
   (erc-display-message parsed '(notice error) 'active
                        's406 ?n (second (erc-response.command-args parsed))))
 
 (define-erc-response-handler (412)
-  ;; No text to send
-  nil nil
+  "No text to send." nil
   (erc-display-message parsed '(notice error) 'active 's412))
 
 (define-erc-response-handler (421)
-  ;; Unknown command
-  nil nil
+  "Unknown command." nil
   (erc-display-message parsed '(notice error) 'active 's421
                        ?c (second (erc-response.command-args parsed))))
 
 (define-erc-response-handler (432)
-  ;; Bad nick.
-  nil nil
+  "Bad nick." nil
   (erc-display-message parsed '(notice error) 'active 's432
                        ?n (second (erc-response.command-args parsed))))
 
 (define-erc-response-handler (433)
-  ;; Login-time "nick in use"
-  nil nil
+  "Login-time \"nick in use\"." nil
   (erc-nickname-in-use (second (erc-response.command-args parsed))
                        "already in use"))
 
 (define-erc-response-handler (437)
-  ;; Nick temporarily unavailable (IRCnet)
-  nil nil
+  "Nick temporarily unavailable (on IRCnet)." nil
   (let ((nick/channel (second (erc-response.command-args parsed))))
     (unless (erc-channel-p nick/channel)
       (erc-nickname-in-use nick/channel "temporarily unavailable"))))
 
 (define-erc-response-handler (442)
-  ;; Not on channel
-  nil nil
+  "Not on channel." nil
   (erc-display-message parsed '(notice error) 'active 's442
                        ?c (second (erc-response.command-args parsed))))
 
 (define-erc-response-handler (461)
-  ;; Not enough params for command.
-  nil nil
+  "Not enough parameters for command." nil
   (erc-display-message parsed '(notice error)  'active 's461
                        ?c (second (erc-response.command-args parsed))
                        ?m (erc-response.contents parsed)))
@@ -1887,7 +1876,7 @@ See `erc-display-server-message'." nil
    (erc-response.contents parsed)))
 
 (define-erc-response-handler (474)
-  "Banned from channel errors" nil
+  "Banned from channel errors." nil
   (erc-display-message parsed '(notice error) nil
                        (intern (format "s%s"
                                        (erc-response.command parsed)))
@@ -1906,14 +1895,14 @@ See `erc-display-server-message'." nil
           (erc-cmd-JOIN channel key)))))
 
 (define-erc-response-handler (477)
-  nil nil
+  "Channel doesn't support modes." nil
   (let ((channel (second (erc-response.command-args parsed)))
         (message (erc-response.contents parsed)))
     (erc-display-message parsed 'notice (erc-get-buffer channel proc)
                          (format "%s: %s" channel message))))
 
 (define-erc-response-handler (482)
-  nil nil
+  "You need to be a channel operator to do that." nil
   (let ((channel (second (erc-response.command-args parsed)))
         (message (erc-response.contents parsed)))
     (erc-display-message parsed '(error notice) 'active 's482
@@ -1935,7 +1924,9 @@ See `erc-display-server-message'." nil
   ;; 491 - No O-lines for your host
   ;; 501 - Unknown MODE flag
   ;; 502 - Cannot change mode for other users
-  nil nil
+  "Generic display of server error messages.
+
+See `erc-display-error-notice'." nil
   (erc-display-error-notice
    parsed
    (intern (format "s%s" (erc-response.command parsed)))))



From MAILER-DAEMON Sat Dec 15 21:11:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J3iyc-0001hf-RE
	for mharc-erc-commit@gnu.org; Sat, 15 Dec 2007 21:11:34 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J3iyb-0001fL-1o
	for erc-commit@gnu.org; Sat, 15 Dec 2007 21:11:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J3iyZ-0001dK-K7
	for erc-commit@gnu.org; Sat, 15 Dec 2007 21:11:32 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J3iyZ-0001cx-6a
	for erc-commit@gnu.org; Sat, 15 Dec 2007 21:11:31 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1J3iyX-0007jm-OD
	for erc-commit@gnu.org; Sat, 15 Dec 2007 21:11:30 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1J3hJr-0004oj-Ny
	for erc-commit@gnu.org; Sat, 15 Dec 2007 19:25:24 -0500
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 1J3hEs-00017z-8B
	for erc-commit@gnu.org; Sat, 15 Dec 2007 19:20:14 -0500
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 1J3hEq-0001uk-RF
	for erc-commit@gnu.org; Sat, 15 Dec 2007 19:20:13 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 15 Dec 2007 19:20:12 -0500
Date: Sat, 15 Dec 2007 19:20:12 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J3hEq-0001uk-RF@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] Updated OFTC nickserv settings. Fixed
	bug in erc-nickserv-identification-autodetect.
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: Sun, 16 Dec 2007 02:11:33 -0000

commit 9b6fbbc206a8e19982ff0aa453168a05919aea6a
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sun Dec 16 01:14:42 2007 +0100

    Updated OFTC nickserv settings.  Fixed bug in erc-nickserv-identification-autodetect.
    
    * erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
    added identified regexp for OFTC.
    (erc-nickserv-identification-autodetect): Make sure success-regex
    is non-nil.

diff --git a/ChangeLog b/ChangeLog
index be111fd..e77c933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-16  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
+	added identified regexp for OFTC.
+	(erc-nickserv-identification-autodetect): Make sure success-regex
+	is non-nil.
+
 2007-12-13  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
diff --git a/erc-services.el b/erc-services.el
index 099166b..be3fb88 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -227,6 +227,8 @@ Example of use:
      "IDENTIFY" nil nil nil)
     (freenode
      "NickServ!NickServ@services."
+     ;; freenode also accepts a password at login, see the `erc'
+     ;; :password argument.
      "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
      "NickServ"
      "IDENTIFY" nil nil
@@ -249,9 +251,11 @@ Example of use:
      "IDENTIFY" nil "SQUERY" nil)
     (OFTC
      "NickServ!services@services.oftc.net"
-     "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
+     ;; OFTC's NickServ doesn't ask you to identify anymore.
+     nil
      "NickServ"
-     "IDENTIFY" nil nil nil)
+     "IDENTIFY" nil nil
+     "You\\s-are\\s-successfully\\s-identified\\s-as\\s-")
     (QuakeNet
      nil nil
      "Q@CServe.quakenet.org"
@@ -334,6 +338,7 @@ If this is the case, run `erc-nickserv-identified-hook'."
     ;; continue only if we're sure it's the real nickserv for this network
     ;; and it's told us we've successfully identified
     (when (and sender (equal sspec sender)
+	       success-regex
 	       (string-match success-regex msg))
       (erc-log "NickServ IDENTIFY success notification detected")
       (run-hook-with-args 'erc-nickserv-identified-hook network nick)



From MAILER-DAEMON Sun Dec 16 12:20:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1J3xA6-0003m0-8B
	for mharc-erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:22 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J3xA4-0003lK-HU
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:20 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J3xA0-0003jl-Bs
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:19 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J3xA0-0003ja-3B
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:16 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	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 1J3x9z-0001Jc-HI
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:16 -0500
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 1J3x9t-0003UV-V5
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:10 -0500
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 1J3x9s-0005L6-AF
	for erc-commit@gnu.org; Sun, 16 Dec 2007 12:20:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 16 Dec 2007 12:20:08 -0500
Date: Sun, 16 Dec 2007 12:20:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1J3x9s-0005L6-AF@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-nickserv-identify-autodetect:
	Make sure identify-regex is non-nil.
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: Sun, 16 Dec 2007 17:20:20 -0000

commit af6f378da1ae2ba17d4502aebd59fab7f46a4716
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sun Dec 16 18:19:59 2007 +0100

    erc-nickserv-identify-autodetect: Make sure identify-regex is non-nil.
    
    (erc-nickserv-identify-autodetect): Make sure identify-regex is
    non-nil.  Doc fix.

diff --git a/ChangeLog b/ChangeLog
index e77c933..53cbede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	added identified regexp for OFTC.
 	(erc-nickserv-identification-autodetect): Make sure success-regex
 	is non-nil.
+	(erc-nickserv-identify-autodetect): Make sure identify-regex is
+	non-nil.  Doc fix.
 
 2007-12-13  Diane Murray  <disumu@x3y2z1.net>
 
diff --git a/erc-services.el b/erc-services.el
index be3fb88..3635981 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -345,9 +345,8 @@ If this is the case, run `erc-nickserv-identified-hook'."
       nil)))
 
 (defun erc-nickserv-identify-autodetect (proc parsed)
-  "Check for a NickServ identify request everytime a notice is received.
-Make sure it is the real NickServ for this network and that it has
-specifically asked the user to IDENTIFY.
+  "Identify to NickServ when an identify request is received.
+Make sure it is the real NickServ for this network.
 If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the
 password for this nickname, otherwise try to send it automatically."
   (unless (and (null erc-nickserv-passwords)
@@ -361,6 +360,7 @@ password for this nickname, otherwise try to send it automatically."
       ;; continue only if we're sure it's the real nickserv for this network
       ;; and it's asked us to identify
       (when (and sender (equal sspec sender)
+		 identify-regex
 		 (string-match identify-regex msg))
 	(erc-log "NickServ IDENTIFY request detected")
 	(erc-nickserv-call-identify-function nick)



