mml2015: Don't check if gpg is available, at compile/load time

* mml2015.el (mml2015-use): Don't check the availability of GnuPG
commands here; instead, only check if epg-config.el is available.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e00479b..de18488 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-07  Daiki Ueno  <ueno@gnu.org>
+
+       * mml2015.el (mml2015-use): Don't check the availability of GnuPG
+       commands here; instead, only check if epg-config.el is available.
+
 2014-03-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * mml.el (mml-expand-html-into-multipart-related): Allow sending HTML

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 7d6aa33..a533829 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -48,12 +48,10 @@
 ;; Then mml1991 would not need to require mml2015, and mml1991-use
 ;; could be removed.
 (defvar mml2015-use (or
-                    (condition-case nil
-                        (progn
-                          (require 'epg-config)
-                          (epg-check-configuration (epg-configuration))
-                          'epg)
-                      (error))
+                    (progn
+                      (ignore-errors (require 'epg-config))
+                      (and (fboundp 'epg-check-configuration)
+                          'epg))
                     (progn
                       (let ((abs-file (locate-library "pgg")))
                         ;; Don't load PGG if it is marked as obsolete