From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Fri, 23 Oct 2015 02:39:47 +0000 (+0000)
Subject: No need to use eval-and-compile
X-Git-Tag: emacs-25.0.90~1057
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3768304c6a501fb5bc90ed9e21a63aebd314a44e;p=emacs.git

No need to use eval-and-compile

* lisp/gnus/auth-source.el: Do require epg (when compiling) before
autoload epg functions.
---

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 8846c2f16c5..304bfa9d401 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -63,12 +63,11 @@
 (autoload 'plstore-save "plstore")
 (autoload 'plstore-get-file "plstore")
 
-(eval-and-compile
-  (autoload 'epg-make-context "epg")
-  (autoload 'epg-context-set-passphrase-callback "epg")
-  (autoload 'epg-decrypt-string "epg")
-  (autoload 'epg-encrypt-string "epg"))
 (eval-when-compile (require 'epg)) ;; setf-method for `epg-context-armor'
+(autoload 'epg-make-context "epg")
+(autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-decrypt-string "epg")
+(autoload 'epg-encrypt-string "epg")
 
 (autoload 'help-mode "help-mode" nil t)