diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-07-02 02:34:12 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2013-07-02 02:34:12 +0000 |
| commit | bb70a65f1de65b5abf87c0b43d03e55ed6e579f6 (patch) | |
| tree | 3621ab051c57b6b640c6105f0d04c74bec5ce28e /lisp/gnus | |
| parent | 5583dcb6c889512e891dc9c6e76acf3654eb4ebc (diff) | |
| download | emacs-bb70a65f1de65b5abf87c0b43d03e55ed6e579f6.tar.gz | |
lisp/gnus/mml2015.el: make key image extraction robuster
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f0bee06f26d..9639f21c2fb 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/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/gnus/mml2015.el b/lisp/gnus/mml2015.el index 389b522aec8..2c2187a5f8d 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/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") |