[gnus git] branch master updated: n0-17-122-gcc52ad3 =1= mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG is not fully working.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via cc52ad34d2922b013fd8026d0728617261979da6 (commit)
from 2aca75967e5dd96135f1975fb3ed375fb1cd4fb3 (commit)
- Log -----------------------------------------------------------------
commit cc52ad34d2922b013fd8026d0728617261979da6
Author: Daiki Ueno <[email protected]>
Date: Thu Jun 30 22:15:13 2011 +0000
mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG is not fully working.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39494a4..af728c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30 Daiki Ueno <[email protected]>
+
+ * mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
+ is not fully working.
+
2011-06-30 Lars Magne Ingebrigtsen <[email protected]>
* dgnushack.el: Autoload sha1 on XEmacs.
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index df106bb..d7070ef 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -55,9 +55,15 @@
'epg)
(error))
(progn
+ (let ((abs-file (locate-library "pgg")))
+ ;; Don't load PGG if it is marked as obsolete
+ ;; (Emacs 24).
+ (when (and abs-file
+ (not (string-match-p "/obsolete/[^/]*\\'"
+ abs-file)))
(ignore-errors (require 'pgg))
(and (fboundp 'pgg-sign-region)
- 'pgg))
+ 'pgg))))
(progn (ignore-errors
(load "mc-toplev"))
(and (fboundp 'mc-encrypt-generic)
-----------------------------------------------------------------------
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 | 12 +++++++++---
2 files changed, 14 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