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

[Dan Nicolaescu]

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

Index: gnus/mml1991.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml1991.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnus/mml1991.el     28 Oct 2007 09:18:28 -0000      1.13
+++ gnus/mml1991.el     16 Nov 2007 16:50:32 -0000      1.14
@@ -244,10 +244,9 @@
 
 ;; 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 @@
 
 ;; 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 @@
   (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"))