[Emacs-diffs] Changes to emacs/lisp/erc/erc-services.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/04/01 13:36:38

Index: lisp/erc/erc-services.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc-services.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- lisp/erc/erc-services.el    21 Jan 2007 02:47:36 -0000      1.5
+++ lisp/erc/erc-services.el    1 Apr 2007 13:36:37 -0000       1.6
@@ -168,15 +168,18 @@
   :type '(repeat
          (list :tag "Network"
                (choice :tag "Network name"
-                       (const freenode)
-                       (const OFTC)
+                       (const Ars)
+                       (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 +189,63 @@
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((BitlBee
-     nil
-     nil
+  '((Ars
+     nil nil
+     "Census"
+     "IDENTIFY" 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"
+     "type\\s-/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 +263,10 @@
    :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?")