[gnus git] branch master updated: =1= Make `mml-smime-use' a defcustom and default to 'epg if EPG is loaded.

       via  def76ca5b9e0efac0c26b27fd48420a6721e89eb (commit)
      from  ba4b37df9e723a3e7e394dce189b8269d5297bfc (commit)


- Log -----------------------------------------------------------------
commit def76ca5b9e0efac0c26b27fd48420a6721e89eb
Author: Ted Zlatanov <[email protected]>
Date:   Mon Jan 24 13:52:00 2011 -0600

    Make `mml-smime-use' a defcustom and default to 'epg if EPG is loaded.
    
    * mml-smime.el (mml-smime-use): Make it a defcustom and default to 'epg
    if EPG is loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0c848d..ce65cdd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-24  Teodor Zlatanov  <[email protected]>
+
+	* mml-smime.el (mml-smime-use): Make it a defcustom and default to 'epg
+	if EPG is loaded.
+
 2011-01-24  Julien Danjou  <[email protected]>
 
 	* shr.el: Use defface to create shr-tag-h[1-6] faces to fontify h[1-6]
diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 4d27384..47176e9 100644
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -37,7 +37,12 @@
 (autoload 'message-narrow-to-headers "message")
 (autoload 'message-fetch-field "message")
 
-(defvar mml-smime-use 'openssl)
+(defcustom mml-smime-use (if (featurep 'epg) 'epg 'openssl)
+  "Whether to use OpenSSL or EPG to decrypt S/MIME messages.
+Defaults to EPG if it's loaded."
+  :group 'mime-security
+  :type '(choice (const :tag "EPG" epg)
+                 (const :tag "OpenSSL" openssl)))
 
 (defvar mml-smime-function-alist
   '((openssl mml-smime-openssl-sign

-----------------------------------------------------------------------
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    |    5 +++++
 lisp/mml-smime.el |    7 ++++++-
 2 files changed, 11 insertions(+), 1 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