Mercurial > emacs

diff lisp/gnus/mml-sec.el @ 108439:c3622fa53abe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 26 Mar 2010 15:03:20 +0000
parents 0fe940324254
children b1e54ed5a91e
line wrap: on
line diff
--- a/lisp/gnus/mml-sec.el	Mon Mar 22 10:47:09 2010 +0000
+++ b/lisp/gnus/mml-sec.el	Fri Mar 26 15:03:20 2010 +0000
@@ -105,12 +105,18 @@
   :group 'message
   :type 'boolean)
 
-(defcustom mml-secure-cache-passphrase password-cache
+(defcustom mml-secure-cache-passphrase
+  (if (boundp 'password-cache)
+      password-cache
+    t)
   "If t, cache passphrase."
   :group 'message
   :type 'boolean)
 
-(defcustom mml-secure-passphrase-cache-expiry password-cache-expiry
+(defcustom mml-secure-passphrase-cache-expiry
+  (if (boundp 'password-cache-expiry)
+      password-cache-expiry
+    16)
   "How many seconds the passphrase is cached.
 Whether the passphrase is cached at all is controlled by
 `mml-secure-cache-passphrase'."