[gnus git] branch master updated: m0-7-154-g2f2e057 =1= mml2015: make key image extraction robuster
Daiki Ueno <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 2f2e0573e0add206e089cdf20ff8774ee22933ae (commit)
from d2b32dc6b962e1944214815e5a136339fa21e568 (commit)
- Log -----------------------------------------------------------------
commit 2f2e0573e0add206e089cdf20ff8774ee22933ae
Author: Daiki Ueno <[email protected]>
Date: Tue Jul 2 11:15:15 2013 +0900
mml2015: make key image extraction robuster
* mml2015.el (mml2015-epg-key-image): Use 'gnus-create-image' instead
of 'create-image' for XEmacs compatibility; check errors when decoding
image. Reported by Uwe Brauer.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d22df32..592e49e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-02 Daiki Ueno <[email protected]>
+
+ * mml2015.el (mml2015-epg-key-image): Use 'gnus-create-image' instead
+ of 'create-image' for XEmacs compatibility; check errors when decoding
+ image. Reported by Uwe Brauer.
+
2013-06-28 Katsumi Yamaoka <[email protected]>
* gnus-art.el (gnus-article-extend-url-button): Make it work again with
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 389b522..2c2187a 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -877,7 +877,9 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
(shell-quote-argument epg-gpg-program) key-id))))
(when (> (length data) 0)
(insert (substring data 16))
- (create-image (buffer-string) nil t)))))
+ (condition-case nil
+ (gnus-create-image (buffer-string) nil t)
+ (error))))))
(autoload 'gnus-rescale-image "gnus-util")
-----------------------------------------------------------------------
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 | 6 ++++++
lisp/mml2015.el | 4 +++-
2 files changed, 9 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