Use gnus-create-image to be XEmacs-compatible; Don't do images on non-graphic displays; by Lars Magne Ingebrigtsen <larsi@gnus.org>.

2 files changed, 22 insertions, 15 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7a88b5f7782..11ab72d21d3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus-html.el (gnus-html-put-image): Use gnus-create-image to be
+        XEmacs-compatible.
+        (gnus-html-put-image): Don't do images on non-graphic displays.
+
         * nnslashdot.el: Removed this unused backend.
 
         * gnus-undo.el (gnus-undo-register-1): Limit the undo actions to 100
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 7bfb3cd785d..cabfe345123 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -162,21 +162,24 @@
         (gnus-html-schedule-image-fetching buffer images)))))
 
 (defun gnus-html-put-image (file point)
-  (let ((image (ignore-errors
-                 (create-image file))))
-    (if (and image
-             ;; Kludge to avoid displaying 30x30 gif images, which
-             ;; seems to be a signal of a broken image.
-             (not (and (eq (getf (cdr image) :type) 'gif)
-                       (= (car (image-size image t)) 30)
-                       (= (cdr (image-size image t)) 30))))
-        (progn
-          (gnus-put-image image nil nil point)
-          t)
-      (when (fboundp 'find-image)
-        (gnus-put-image (find-image '((:type xpm :file "lock-broken.xpm")))
-                        nil nil point))
-      nil)))
+  (when (display-graphic-p)
+    (let ((image (ignore-errors
+                   (gnus-create-image file))))
+      (save-excursion
+        (goto-char point)
+        (if (and image
+                 ;; Kludge to avoid displaying 30x30 gif images, which
+                 ;; seems to be a signal of a broken image.
+                 (not (and (eq (getf (cdr image) :type) 'gif)
+                           (= (car (image-size image t)) 30)
+                           (= (cdr (image-size image t)) 30))))
+            (progn
+              (gnus-put-image image)
+              t)
+          (when (fboundp 'find-image)
+            (gnus-put-image (find-image
+                             '((:type xpm :file "lock-broken.xpm")))))
+          nil)))))
 
 (defun gnus-html-prune-cache ()
   (let ((total-size 0)