[Emacs-diffs] Changes to emacs/lisp/gnus/mml-smime.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/16 16:50:36

Index: gnus/mml-smime.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml-smime.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnus/mml-smime.el   28 Oct 2007 09:18:27 -0000      1.12
+++ gnus/mml-smime.el   16 Nov 2007 16:50:32 -0000      1.13
@@ -298,13 +298,13 @@
 (defun mml-smime-openssl-verify-test (handle ctl)
   smime-openssl-program)
 
-(eval-and-compile
-  (autoload 'epg-make-context "epg"))
+(defvar epg-user-id-alist)
+(defvar epg-digest-algorithm-alist)
+(defvar inhibit-redisplay)
+(defvar password-cache-expiry)
 
 (eval-when-compile
-  (defvar epg-user-id-alist)
-  (defvar epg-digest-algorithm-alist)
-  (defvar inhibit-redisplay)
+  (autoload 'epg-make-context "epg")
   (autoload 'epg-context-set-armor "epg")
   (autoload 'epg-context-set-signers "epg")
   (autoload 'epg-context-result-for "epg")
@@ -319,10 +319,7 @@
   (autoload 'epg-context-set-passphrase-callback "epg")
   (autoload 'epg-configuration "epg-config")
   (autoload 'epg-expand-group "epg-config")
-  (autoload 'epa-select-keys "epa"))
-
-(eval-when-compile
-  (defvar password-cache-expiry)
+  (autoload 'epa-select-keys "epa")
   (autoload 'password-read "password")
   (autoload 'password-cache-add "password")
   (autoload 'password-cache-remove "password"))