diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-08-14 13:34:20 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-08-14 13:34:20 +0800 |
| commit | b4599732c30ebf9eaa49986d70d64800e2b93225 (patch) | |
| tree | 5601113f3b0fb986a8871ebd290d48b02581b9e5 /lisp/gnus | |
| parent | f48b82fd19703c5001c9cceb14b4d8372ce2b083 (diff) | |
| download | emacs-b4599732c30ebf9eaa49986d70d64800e2b93225.tar.gz | |
* gnus-art.el (article-display-face): Handle failure in gnus-create-image.
Fixes: debbugs:11802
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7f2a7536717..df35e998c31 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/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/gnus-art.el b/lisp/gnus/gnus-art.el index bb374fba11b..b9020a40b75 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/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." |