Convert consecutive FSF copyright years to ranges.

[bpt/emacs.git] / lisp / erc / erc-services.el

diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 5062816..3acc600 100644 (file)
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2011 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -232,10 +232,11 @@ Example of use:
      "NickServ!NickServ@services."
      ;; freenode also accepts a password at login, see the `erc'
      ;; :password argument.
-     "/msg\\s-NickServ\\s-\ 2IDENTIFY\ 2\\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."
@@ -302,7 +303,11 @@ The last two elements are optional."
                 (boolean :tag "Use current nick in identify message?")
                 (choice :tag "Command to use (optional)"
                  (string :tag "Command")
-                 (const :tag "No special command necessary" nil)))))
+                 (const :tag "No special command necessary" nil))
+                (choice :tag "Detect Success"
+                        (regexp :tag "Pattern to match")
+                        (const :tag "Do not try to detect success" nil)))))
+
 
 (defsubst erc-nickserv-alist-sender (network &optional entry)
   (nth 1 (or entry (assoc network erc-nickserv-alist))))
@@ -440,4 +445,3 @@ When called interactively, read the password using `read-passwd'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58