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 b25a10d..3acc600 100644 (file)
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -1,13 +1,13 @@
 ;;; 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.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -234,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."
@@ -304,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))))
@@ -442,4 +445,3 @@ When called interactively, read the password using `read-passwd'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58