2006-09-06 Simon Josefsson <jas@extundo.com>

	* mml2015.el (mml2015-use): Doc fix, mention epg.

2006-09-06  Daiki Ueno  <ueno@unixuser.org>

	* mml2015.el (mml2015-use): Default to epg, if available.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6e7720..12adf72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-06  Simon Josefsson  <jas@extundo.com>
+
+       * mml2015.el (mml2015-use): Doc fix, mention epg.
+
+2006-09-06  Daiki Ueno  <ueno@unixuser.org>
+
+       * mml2015.el (mml2015-use): Default to epg, if available.
+
 2006-09-06  Daiki Ueno  <ueno@unixuser.org>
 
        * mml1991.el (mml1991-epg-sign): Don't lookup a private kye by

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 18d0a87..af4ac99 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -39,6 +39,12 @@
 (defvar mc-pgp-always-sign)
 
 (defvar mml2015-use (or
+                    (condition-case nil
+                        (progn
+                          (require 'epg-config)
+                          (epg-check-configuration (epg-configuration))
+                          t)
+                      (error))
                     (progn
                       (ignore-errors
                        ;; Avoid the "Recursive load suspected" error
@@ -59,7 +65,7 @@
                                 (fboundp 'mc-cleanup-recipient-headers)
                                 'mailcrypt)))
   "The package used for PGP/MIME.
-Valid packages include `pgg', `gpg' and `mailcrypt'.")
+Valid packages include `epg', `pgg', `gpg' and `mailcrypt'.")
 
 ;; Something is not RFC2015.
 (defvar mml2015-function-alist