[gnus git] branch master updated: m0-9-69-g8ace698 =1= mml2015: Don't check if gpg is available, at compile/load time

       via  8ace698e1ce1772d7a7431f947d47591c2ac0656 (commit)
      from  b6bd61909a3d4117db40e6a802e88fae3dede67b (commit)


- Log -----------------------------------------------------------------
commit 8ace698e1ce1772d7a7431f947d47591c2ac0656
Author: Daiki Ueno <[email protected]>
Date:   Fri Mar 7 16:17:16 2014 +0900

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-07  Daiki Ueno  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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
--- 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))
+		       (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

-----------------------------------------------------------------------
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/mml2015.el |   10 ++++------
 2 files changed, 9 insertions(+), 6 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