[Emacs-diffs] /srv/bzr/emacs/trunk r109596: * gnus-art.el (article-display-face): Handle failure in gnus-create-image.

[Chong Yidong]

------------------------------------------------------------
revno: 109596
fixes bug: http://debbugs.gnu.org/11802
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-14 13:34:20 +0800
message:
  * gnus-art.el (article-display-face): Handle failure in gnus-create-image.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-08-10 21:20:24 +0000
+++ b/lisp/gnus/ChangeLog       2012-08-14 05:34:20 +0000
@@ -1,3 +1,8 @@
+2012-08-14  Chong Yidong  <address@hidden>
+
+       * gnus-art.el (article-display-face): Handle failure in
+       gnus-create-image (Bug#11802).
+
 2012-08-10  Stefan Monnier  <address@hidden>
 
        * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-groups):

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2012-07-25 22:10:37 +0000
+++ b/lisp/gnus/gnus-art.el     2012-08-14 05:34:20 +0000
@@ -2437,9 +2437,10 @@
                        (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."