From: Daiki Ueno Date: Tue, 2 Jul 2013 02:15:15 +0000 (+0900) Subject: mml2015: make key image extraction robuster X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=2f2e0573e0add206e089cdf20ff8774ee22933ae 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 d22df3217..592e49ebf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-07-02 Daiki Ueno + + * 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 * gnus-art.el (gnus-article-extend-url-button): Make it work again with diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 389b522ae..2c2187a5f 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")