Synch to No Gnus 200504221124.

[elisp/gnus.git-] / lisp / encrypt.el

diff --git a/lisp/encrypt.el b/lisp/encrypt.el
index 7e3598a..e5da278 100644 (file)
--- a/lisp/encrypt.el
+++ b/lisp/encrypt.el
@@ -1,5 +1,5 @@
 ;;; encrypt.el --- file encryption routines
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Created: 2003/01/24
@@ -33,23 +33,16 @@
 ;; autoload password
 (eval-and-compile
   (autoload 'password-read "password")
-  ;; Those two autoloads are needed since T-gnus won't load password.el
+  ;; The following section is needed since T-gnus won't load password.el
   ;; by way of pgg.el at the compile time.
   (autoload 'password-read-and-add "password")
-  (autoload 'password-cache-remove "password"))
+  (autoload 'password-cache-remove "password")
+  (defvar password-cache-expiry))
 
-(defgroup encrypt nil
+(defgroup encrypt '((password-cache custom-variable)
+                   (password-cache-expiry custom-variable))
   "File encryption configuration.")
 
-(defcustom encrypt-password-cache-expiry 200
-  "Encryption password timeout.
-When set, directly sets password-cache-expiry"
-  :type 'integer
-  :group 'encrypt
-  :set (lambda (symbol value)
-        (set symbol value)
-        (setq password-cache-expiry value)))
-
 (defcustom encrypt-file-alist nil
   "List of file names or regexes matched with encryptions.
 Format example: