Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org

[gnu-emacs] / lisp / erc / erc-services.el

diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 3acc600b425e92db71976f22916d8bfb6644c9c4..1e3c3b17a23f6eb03497d151d42eacb20f5b8750 100644 (file)
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -1,6 +1,8 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002-2004, 2006-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
 
 ;; This file is part of GNU Emacs.
 
@@ -60,7 +62,7 @@
 
 (require 'erc)
 (require 'erc-networks)
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 ;; Customization:
 
@@ -195,7 +197,8 @@ Example of use:
                (repeat :tag "Nickname and password"
                        (cons :tag "Identity"
                              (string :tag "Nick")
-                             (string :tag "Password"))))))
+                             (string :tag "Password"
+                                      :secret ?*))))))
 
 ;; Variables: