Merge from gnus--rel--5.10

[gnus] / lisp / canlock.el

diff --git a/lisp/canlock.el b/lisp/canlock.el
index 15825b8..3f51ad4 100644 (file)
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -1,7 +1,7 @@
 ;;; canlock.el --- functions for Cancel-Lock feature
 
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
@@ -18,8 +18,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -44,26 +44,24 @@
 (eval-when-compile
   (require 'cl))
 
-(require 'sha1-el)
+(require 'sha1)
 
-(autoload 'base64-encode-string "base64")
-(autoload 'mail-fetch-field "mail-utils")
 (defvar mail-header-separator)
 
 (defgroup canlock nil
   "The Cancel-Lock feature."
-  :group 'applications)
+  :group 'news)
 
 (defcustom canlock-password nil
   "Password to use when signing a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-               (string :tag "Password" :size 0))
+               (string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-password-for-verify canlock-password
   "Password to use when verifying a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-               (string :tag "Password" :size 0))
+               (string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-force-insert-header nil
@@ -249,4 +247,5 @@ it fails."
 
 (provide 'canlock)
 
+;;; arch-tag: 033c4f09-b9f1-459d-bd0d-254430283f78
 ;;; canlock.el ends here