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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-02  Daiki Ueno  <ueno@gnu.org>
+
+       * 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  <yamaoka@jpl.org>
 
        * 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 (file)
--- 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")