[Emacs-diffs] trunk r113254: lisp/gnus/mml2015.el: make key image extraction robuster

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113254
revision-id: address@hidden
parent: address@hidden
author: Daiki Ueno <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-02 02:34:12 +0000
message:
  lisp/gnus/mml2015.el: make key image extraction robuster
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/mml2015.el           mml2015.el-20091113204419-o5vbwnq5f7feedwu-3261

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-06-30 15:10:33 +0000
+++ b/lisp/gnus/ChangeLog       2013-07-02 02:34:12 +0000
@@ -1,3 +1,9 @@
+2013-07-02  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-art.el (gnus-article-extend-url-button): Make it work again with

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2013-06-14 06:51:56 +0000
+++ b/lisp/gnus/mml2015.el      2013-07-02 02:34:12 +0000
@@ -877,7 +877,9 @@
                           (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")