Mercurial > emacs
changeset 110159:2fe16dc7896c
gnus-html.el (gnus-html-put-image): make avoidance of displaying small images work for XEmacs.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 03 Sep 2010 06:10:04 +0000 |
| parents | 64b3982570b5 |
| children | c32f6ba217a2 b0a4e30a5f31 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Sep 03 02:29:03 2010 +0000 +++ b/lisp/gnus/ChangeLog Fri Sep 03 06:10:04 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.
--- a/lisp/gnus/gnus-html.el Fri Sep 03 02:29:03 2010 +0000 +++ b/lisp/gnus/gnus-html.el Fri Sep 03 06:10:04 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