Mercurial > emacs
changeset 110247:3112c0c11b6e
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 03 Sep 2010 03:34:33 +0000 |
| parents | aff5a41a067d (current diff) 64b3982570b5 (diff) |
| children | b0a4e30a5f31 |
| files | |
| diffstat | 3 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Sep 03 01:17:46 2010 +0000 +++ b/lisp/gnus/ChangeLog Fri Sep 03 03:34:33 2010 +0000 @@ -1,5 +1,12 @@ 2010-09-03 Katsumi Yamaoka <yamaoka@jpl.org> + * 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. + + * gnus-util.el (gnus-graphic-display-p): Use device-on-window-system-p + for XEmacs. + * gnus-ems.el (gnus-set-process-plist, gnus-process-plist): Change name of symbol that holds plist data. (gnus-process-plist): Remove plist of process after getting it.
--- a/lisp/gnus/gnus-html.el Fri Sep 03 01:17:46 2010 +0000 +++ b/lisp/gnus/gnus-html.el Fri Sep 03 03:34:33 2010 +0000 @@ -242,11 +242,13 @@ (gnus-html-schedule-image-fetching buffer images))))) (defun gnus-html-put-image (file point string) - (when (display-graphic-p) + (when (gnus-graphic-display-p) (let* ((image (ignore-errors (gnus-create-image file))) (size (and image - (image-size image t)))) + (if (featurep 'xemacs) + (cons (glyph-width image) (glyph-height image)) + (image-size image t))))) (save-excursion (goto-char point) (if (and image
--- a/lisp/gnus/gnus-util.el Fri Sep 03 01:17:46 2010 +0000 +++ b/lisp/gnus/gnus-util.el Fri Sep 03 03:34:33 2010 +0000 @@ -1580,11 +1580,9 @@ (car (symbol-value history)))) (defun gnus-graphic-display-p () - (or (and (fboundp 'display-graphic-p) - (display-graphic-p)) - ;;;!!!This is bogus. Fixme! - (and (featurep 'xemacs) - t))) + (if (featurep 'xemacs) + (device-on-window-system-p) + (display-graphic-p))) (put 'gnus-parse-without-error 'lisp-indent-function 0) (put 'gnus-parse-without-error 'edebug-form-spec '(body))