Mercurial > emacs
changeset 110248:b0a4e30a5f31
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 03 Sep 2010 06:22:01 +0000 |
| parents | 3112c0c11b6e (current diff) 2fe16dc7896c (diff) |
| children | c3d85dc16abc |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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