gnus-html.el (gnus-html-put-image): make avoidance of displaying small images work...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b993c53..c84a245 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,11 @@
 2010-09-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * lpath.el: Fbind device-on-window-system-p for Emacs 21.
+       * lpath.el: Fbind device-on-window-system-p, glyph-image, glyphp, and
+       specifier-spec-list for Emacs 21.
 
        * 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 --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 399676f..8717a46 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -254,8 +254,16 @@ fit these criteria."
        (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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 107fcce..1eb3540 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -45,11 +45,12 @@
        coding-system-aliasee coding-system-from-name custom-autoload
        delete-annotation delete-extent device-connection
        device-on-window-system-p dfw-device events-to-keys find-face
-       font-lock-set-defaults get-char-table glyph-height glyph-width
-       help-buffer int-to-char ldap-search-entries mail-aliases-setup
-       make-annotation make-event make-glyph make-network-process map-extents
-       message-xmas-redefine put-char-table run-mode-hooks set-extent-property
-       set-itimer-function set-keymap-default-binding temp-directory
+       font-lock-set-defaults get-char-table glyph-height glyph-image
+       glyph-width glyphp help-buffer int-to-char ldap-search-entries
+       mail-aliases-setup make-annotation make-event make-glyph
+       make-network-process map-extents message-xmas-redefine put-char-table
+       run-mode-hooks set-extent-property set-itimer-function
+       set-keymap-default-binding specifier-spec-list temp-directory
        time-to-seconds ucs-to-char unicode-precedence-list unicode-to-char
        url-generic-parse-url url-http-file-exists-p
        valid-image-instantiator-format-p vcard-pretty-print