[Erc-commit] [commit][emacs22] erc-services: Add entry for QuakeNet and fix customization

[mwolson]

commit cfff5f755bf9d43509696630b899e39b99505b90
Author: Michael Olson <address@hidden>
Date:   Mon Jan 22 01:15:52 2007 +0000

    erc-services: Add entry for QuakeNet and fix customization
    
    2007-01-22  Michael Olson  <address@hidden>
    
        * erc-services.el (erc-nickserv-alist): Alphabetize and add
        QuakeNet.  Standardize look of entries.  Fix type mismatch error
        in customize interface.
        (erc-nickserv-passwords): Alphabetize and add missing entries from
        erc-nickserv-alist.
    git-archimport-id: address@hidden/erc--main--0--patch-97

diff --git a/ChangeLog b/ChangeLog
index 25b8e58..f0bf9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-22  Michael Olson  <address@hidden>
+
+       * erc-services.el (erc-nickserv-alist): Alphabetize and add
+       QuakeNet.  Standardize look of entries.  Fix type mismatch error
+       in customize interface.
+       (erc-nickserv-passwords): Alphabetize and add missing entries from
+       erc-nickserv-alist.
+
 2007-01-21  Michael Olson  <address@hidden>
 
        * erc.el (erc-header-line-format): Document how to disable the
diff --git a/erc-services.el b/erc-services.el
index ce505f5..8b59181 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -168,15 +168,17 @@ Example of use:
   :type '(repeat
          (list :tag "Network"
                (choice :tag "Network name"
-                       (const freenode)
-                       (const OFTC)
+                       (const Austnet)
+                       (const Azzurra)
+                       (const BitlBee)
+                       (const BRASnet)
                        (const DALnet)
+                       (const freenode)
                        (const GalaxyNet)
-                       (const SlashNET)
-                       (const BRASnet)
                        (const iip)
-                       (const Austnet)
-                       (const Azzurra)
+                       (const OFTC)
+                       (const QuakeNet)
+                       (const SlashNET)
                        (symbol :tag "Network name"))
                (repeat :tag "Nickname and password"
                        (cons :tag "Identity"
@@ -186,68 +188,59 @@ Example of use:
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((BitlBee
-     nil
-     nil
+  '((Austnet
+     "address@hidden"
+     "/address@hidden<password>"
+     "address@hidden"
+     "identify" nil nil)
+    (Azzurra
+     "address@hidden"
+     "/ns\\s-IDENTIFY\\s-password"
+     "NickServ"
+     "IDENTIFY" nil nil)
+    (BitlBee
+     nil nil
      "&bitlbee"
-     "identify"
-     nil)
+     "identify" nil nil)
+    (BRASnet
+     "address@hidden"
+     "/NickServ\\s-IDENTIFY\\s-senha"
+     "NickServ"
+     "IDENTIFY" nil "")
     (DALnet
      "address@hidden"
      "/address@hidden<password>"
      "address@hidden"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil nil)
     (freenode
      "address@hidden"
      "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
      "NickServ"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil nil)
     (GalaxyNet
      "address@hidden"
      "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
      "address@hidden"
-     "AUTH"
-     t)
-    (SlashNET
-     "address@hidden"
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
-     "address@hidden"
-     "IDENTIFY"
-     nil)
+     "AUTH" t nil)
     (iip
      "address@hidden"
      "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
      "address@hidden"
-     "IDENTIFY"
-     nil
-     "SQUERY")
-    (BRASnet
-     "address@hidden"
-     "/NickServ\\s-IDENTIFY\\s-senha"
-     "NickServ"
-     "IDENTIFY"
-     nil
-     "")
-    (Austnet
-     "address@hidden"
-     "/address@hidden<password>"
-     "address@hidden"
-     "identify"
-     nil)
-    (Azzurra
-     "address@hidden"
-     "/ns\\s-IDENTIFY\\s-password"
-     "NickServ"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil "SQUERY")
     (OFTC
      "address@hidden"
      "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
      "NickServ"
-     "IDENTIFY"
-     nil))
+     "IDENTIFY" nil nil)
+    (QuakeNet
+     nil nil
+     "address@hidden"
+     "auth" t nil)
+    (SlashNET
+     "address@hidden"
+     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
+     "address@hidden"
+     "IDENTIFY" 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)
@@ -265,8 +258,10 @@ ANSWER is the command to use for the answer.  The default 
is 'privmsg.
    :type '(repeat
           (list :tag "Nickserv data"
                 (symbol :tag "Network name")
-                (string :tag "Nickserv's address@hidden")
-                (regexp :tag "Identify request sent by Nickserv")
+                (choice (string :tag "Nickserv's address@hidden")
+                        (const :tag "No message sent by Nickserv" nil))
+                (choice (regexp :tag "Identify request sent by Nickserv")
+                        (const :tag "No message sent by Nickserv" nil))
                 (string :tag "Identify to")
                 (string :tag "Identify keyword")
                 (boolean :tag "Use current nick in identify message?")