# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283494921 0
# Node ID b0a4e30a5f31737d060cee61b00c3cd10245bec8
# Parent  3112c0c11b6e55cfa4cc63037a510fa2e161e364# Parent  2fe16dc7896cdcaf097fa13a065900fd8e888cd0
Merge from mainline.

diff -r 3112c0c11b6e -r b0a4e30a5f31 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Sep 03 03:34:33 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri Sep 03 06:22:01 2010 +0000
@@ -2,7 +2,7 @@
 
 	* gnus-html.el (gnus-html-put-image): Use gnus-graphic-display-p,
 	glyph-width and glyph-height instead of display-graphic-p and
-	image-size for XEmacs.
+	image-size; make avoidance of displaying small images work for XEmacs.
 
 	* gnus-util.el (gnus-graphic-display-p): Use device-on-window-system-p
 	for XEmacs.
diff -r 3112c0c11b6e -r b0a4e30a5f31 lisp/gnus/gnus-html.el
--- a/lisp/gnus/gnus-html.el	Fri Sep 03 03:34:33 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Fri Sep 03 06:22:01 2010 +0000
@@ -254,8 +254,16 @@
 	(if (and image
 		 ;; Kludge to avoid displaying 30x30 gif images, which
 		 ;; seems to be a signal of a broken image.
-		 (not (and (listp image)
-			   (eq (plist-get (cdr image) :type) 'gif)
+		 (not (and (if (featurep 'xemacs)
+			       (glyphp image)
+			     (listp image))
+			   (eq (if (featurep 'xemacs)
+				   (let ((data (cdadar (specifier-spec-list
+							(glyph-image image)))))
+				     (and (vectorp data)
+					  (aref data 0)))
+				 (plist-get (cdr image) :type))
+			       'gif)
 			   (= (car size) 30)
 			   (= (cdr size) 30))))
 	    (progn