[Emacs-diffs] /srv/bzr/emacs/trunk r101310: gnus-html.el (gnus-html-put-image): make avoidance of displaying small images work for XEmacs.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101310
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-03 06:10:04 +0000
message:
  gnus-html.el (gnus-html-put-image): make avoidance of displaying small images 
work for XEmacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-03 02:29:03 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-03 06:10:04 +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.

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-09-03 02:29:03 +0000
+++ b/lisp/gnus/gnus-html.el    2010-09-03 06:10:04 +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