[Emacs-diffs] master bf40ed2: Fix auth-source-epa-make-gpg-token compilation (bug#21724)

[Katsumi Yamaoka]

branch: master
commit bf40ed21a0de4e109f2a798afc4e37ef384884b2
Author: Katsumi Yamaoka <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    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)
---
 lisp/gnus/auth-source.el |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 75e6d04..8846c2f 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)