[gnus git] branch master updated: n0-17-115-g0de6541 =1= Autoload EPA/EPG functions.

       via  0de65416e6335fa121f250c6ca8e95693df2bf94 (commit)
      from  9ff1923f5172cfd71e0945bf71a8aeba37822a31 (commit)


- Log -----------------------------------------------------------------
commit 0de65416e6335fa121f250c6ca8e95693df2bf94
Author: Ted Zlatanov <[email protected]>
Date:   Thu Jun 30 09:35:47 2011 -0500

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-30  Teodor Zlatanov  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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
--- 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

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    6 ++++++
 lisp/auth-source.el |   15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project