projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch with Emacs trunk
[gnus]
/
lisp
/
mml2015.el
diff --git
a/lisp/mml2015.el
b/lisp/mml2015.el
index
65cf1a8
..
6725709
100644
(file)
--- a/
lisp/mml2015.el
+++ b/
lisp/mml2015.el
@@
-30,7
+30,11
@@
;; For Emacs < 22.2.
(eval-and-compile
;; For Emacs < 22.2.
(eval-and-compile
- (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+
+ (if (locate-library "password-cache")
+ (require 'password-cache)
+ (require 'password)))
(eval-when-compile (require 'cl))
(require 'mm-decode)
(eval-when-compile (require 'cl))
(require 'mm-decode)
@@
-986,8
+990,6
@@
Whether the passphrase is cached at all is controlled by
(autoload 'epg-expand-group "epg-config")
(autoload 'epa-select-keys "epa")
(autoload 'epg-expand-group "epg-config")
(autoload 'epa-select-keys "epa")
-(defvar password-cache-expiry)
-
(defvar mml2015-epg-secret-key-id-list nil)
(defun mml2015-epg-passphrase-callback (context key-id ignore)
(defvar mml2015-epg-secret-key-id-list nil)
(defun mml2015-epg-passphrase-callback (context key-id ignore)