summaryrefslogtreecommitdiff
path: root/lisp/gnus/mml1991.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus/mml1991.el')
-rw-r--r--lisp/gnus/mml1991.el20
1 files changed, 8 insertions, 12 deletions
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index f6d2dcc7ad5..234f1fe2147 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -244,10 +244,9 @@ Whether the passphrase is cached at all is controlled by
;; pgg wrapper
-(eval-when-compile
- (defvar pgg-default-user-id)
- (defvar pgg-errors-buffer)
- (defvar pgg-output-buffer))
+(defvar pgg-default-user-id)
+(defvar pgg-errors-buffer)
+(defvar pgg-output-buffer)
(defun mml1991-pgg-sign (cont)
(let ((pgg-text-mode t)
@@ -313,11 +312,11 @@ Whether the passphrase is cached at all is controlled by
;; epg wrapper
-(eval-and-compile
- (autoload 'epg-make-context "epg"))
+(defvar epg-user-id-alist)
+(defvar password-cache-expiry)
-(eval-when-compile
- (defvar epg-user-id-alist)
+(eval-and-compile
+ (autoload 'epg-make-context "epg")
(autoload 'epg-passphrase-callback-function "epg")
(autoload 'epa-select-keys "epa")
(autoload 'epg-list-keys "epg")
@@ -328,10 +327,7 @@ Whether the passphrase is cached at all is controlled by
(autoload 'epg-sign-string "epg")
(autoload 'epg-encrypt-string "epg")
(autoload 'epg-configuration "epg-config")
- (autoload 'epg-expand-group "epg-config"))
-
-(eval-when-compile
- (defvar password-cache-expiry)
+ (autoload 'epg-expand-group "epg-config")
(autoload 'password-read "password")
(autoload 'password-cache-add "password")
(autoload 'password-cache-remove "password"))