| author | Chong Yidong <cyd@gnu.org> | 2012-08-14 10:41:27 (GMT) |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-08-14 10:41:27 (GMT) |
| commit | dc29a0ac24494cca2f98b5a7779bfa84329f678d (patch) (side-by-side diff) | |
| tree | 11a5a6ac48c9642c65ed72216f8b3225812699b1 | |
| parent | 240d70a44d7e3b45e668f639fca8837eb12ef567 (diff) | |
| download | gnus-dc29a0ac24494cca2f98b5a7779bfa84329f678d.zip | |
gnus-art.el (article-display-face): Handle failure in gnus-create-image (Bug#11802)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus-art.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf380d0..b439bc3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-08-14 Chong Yidong <cyd@gnu.org> + + * gnus-art.el (article-display-face): Handle failure in + gnus-create-image (Bug#11802). + 2012-08-10 Stefan Monnier <monnier@iro.umontreal.ca> * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-groups): diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index bb374fb..b9020a4 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2437,9 +2437,10 @@ long lines if and only if arg is positive." (apply 'gnus-create-image png 'png t (cdr (assq 'png gnus-face-properties-alist)))) (goto-char from) - (gnus-add-wash-type 'face) - (gnus-add-image 'face image) - (gnus-put-image image nil 'face)))))))))) + (when image + (gnus-add-wash-type 'face) + (gnus-add-image 'face image) + (gnus-put-image image nil 'face))))))))))) (defun article-display-x-face (&optional force) "Look for an X-Face header and display it if present." |