From: Chong Yidong <cyd@gnu.org>
Date: Tue, 14 Aug 2012 05:34:20 +0000 (+0800)
Subject: * gnus-art.el (article-display-face): Handle failure in gnus-create-image.
X-Git-Tag: emacs-24.2.90~693
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4599732c30ebf9eaa49986d70d64800e2b93225;p=emacs.git

* gnus-art.el (article-display-face): Handle failure in gnus-create-image.

Fixes: debbugs:11802
---

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."