[Erc-commit] [commit][emacs22] Added OFTC network and fixed its NickServ message regexp.

[mwolson]

commit 8d667fc63f40b94e5866d3ec8511318afc23d6bb
Author: Diane Murray <address@hidden>
Date:   Thu Jan 25 03:27:46 2007 +0000

    Added OFTC network and fixed its NickServ message regexp.
    
    * erc-networks.el (erc-server-alist, erc-networks-alist): Added
    definitions for oftc.net.
    
    * erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
    git-archimport-id: address@hidden/erc--main--0--patch-100

diff --git a/ChangeLog b/ChangeLog
index 2e8d3e5..37bb704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-25  Diane Murray  <address@hidden>
+
+       * erc-networks.el (erc-server-alist, erc-networks-alist): Added
+       definitions for oftc.net.
+
+       * erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
+
 2007-01-22  Michael Olson  <address@hidden>
 
        * erc-backend.el (erc-server-error-occurred): New variable that
diff --git a/erc-networks.el b/erc-networks.el
index b5c13d8..8b88614 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -317,6 +317,8 @@
   ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
   ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 
7000 ))
   ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
+  ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000))
+  ("OFTC: SSL enabled server" OFTC "ircs.oftc.net" (6697 9999))
   ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
   ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
   ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
@@ -611,6 +613,7 @@ PORTS is either a number, a list of numbers, or a list of 
port ranges."
     (Novernet "novernet.com")
     (Nullrouted "nullrouted.org")
     (NullusNet "nullus.net")
+    (OFTC "oftc.net")
     (OpChat "opchat.org")
     (Openprojects "openprojects.net")
     (Othernet "othernet.org")
diff --git a/erc-services.el b/erc-services.el
index 213f41e..74cfeb4 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -234,7 +234,7 @@ Example of use:
      "IDENTIFY" nil "SQUERY")
     (OFTC
      "address@hidden"
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
+     "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
      "NickServ"
      "IDENTIFY" nil nil)
     (QuakeNet