From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 22 Oct 2015 23:55:31 +0000 (+0000)
Subject: Fix auth-source-epa-make-gpg-token compilation (bug#21724)
X-Git-Tag: emacs-25.0.90~1058
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf40ed21a0de4e109f2a798afc4e37ef384884b2;p=emacs.git

Fix auth-source-epa-make-gpg-token compilation (bug#21724)

* lisp/gnus/auth-source.el: Add eval-and-compile to autoloads for
epg-context-set-passphrase-callback, epg-decrypt-string, and
epg-encrypt-string; require epg when compiling for the setf-method
for epg-context-armor. (bug#21724)
---

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 75e6d0499d0..8846c2f16c5 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -63,11 +63,12 @@
 (autoload 'plstore-save "plstore")
 (autoload 'plstore-get-file "plstore")
 
-(autoload 'epg-make-context "epg")
-(autoload 'epg-context-set-passphrase-callback "epg")
-(autoload 'epg-decrypt-string "epg")
-(autoload 'epg-context-set-armor "epg")
-(autoload 'epg-encrypt-string "epg")
+(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 'help-mode "help-mode" nil t)