[gnus git] branch master updated: m0-5-84-gdc29a0a =1= gnus-art.el (article-display-face): Handle failure in gnus-create-image (Bug#11802)

       via  dc29a0ac24494cca2f98b5a7779bfa84329f678d (commit)
      from  240d70a44d7e3b45e668f639fca8837eb12ef567 (commit)


- Log -----------------------------------------------------------------
commit dc29a0ac24494cca2f98b5a7779bfa84329f678d
Author: Chong Yidong <[email protected]>
Date:   Tue Aug 14 10:41:27 2012 +0000

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

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  <[email protected]>
+
+	* gnus-art.el (article-display-face): Handle failure in
+	gnus-create-image (Bug#11802).
+
 2012-08-10  Stefan Monnier  <[email protected]>
 
 	* 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)
+		  (when image
 		  (gnus-add-wash-type 'face)
 		  (gnus-add-image 'face image)
-		  (gnus-put-image image nil 'face))))))))))
+		    (gnus-put-image image nil 'face)))))))))))
 
 (defun article-display-x-face (&optional force)
   "Look for an X-Face header and display it if present."

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    5 +++++
 lisp/gnus-art.el |    7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project