Autoload EPA/EPG functions.

* auth-source.el: Autoload EPA/EPG functions.
(auth-source-netrc-use-gpg-tokens): Clarify that it should not be
changed when EPA/EPG is not available.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 552adae..4d8aa64 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-30  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * auth-source.el: Autoload EPA/EPG functions.
+       (auth-source-netrc-use-gpg-tokens): Clarify that it should not be
+       changed when EPA/EPG is not available.
+
 2011-06-30  Andrew Cohen  <cohen@andy.bu.edu>
 
        * gnus-art.el (gnus-request-article-this-buffer): Use existing function

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 63a9593..449d8c5 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -43,8 +43,6 @@
 (require 'mm-util)
 (require 'gnus-util)
 (require 'assoc)
-(require 'epa)
-(require 'epg)
 
 (eval-when-compile (require 'cl))
 (eval-and-compile
@@ -75,6 +73,16 @@
 (autoload 'plstore-save "plstore")
 (autoload 'plstore-get-file "plstore")
 
+(autoload 'epa-passphrase-callback-function "epa")
+
+(autoload 'epg-context-operation "epg")
+(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-context-set-passphrase-callback "epg")
+(autoload 'epg-encrypt-string "epg")
+
 (defvar secrets-enabled)
 
 (defgroup auth-source nil
@@ -181,7 +189,8 @@ let-binding."
 
 (defcustom auth-source-netrc-use-gpg-tokens 'never
   "Set this to tell auth-source when to create GPG password
-tokens in netrc files.  It's either an alist or `never'."
+tokens in netrc files.  It's either an alist or `never'.
+Note that if EPA/EPG is not available, this should NOT be used."
   :group 'auth-source
   :version "23.2" ;; No Gnus
   :type `(choice