[Emacs-diffs] /srv/bzr/emacs/trunk r101309: Make gnus-html work for XEmacs.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101309
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-03 02:29:03 +0000
message:
  Make gnus-html work for XEmacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-03 01:00:10 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-03 02:29:03 +0000
@@ -1,5 +1,12 @@
 2010-09-03  Katsumi Yamaoka  <address@hidden>
 
+       * 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.

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

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/gnus-util.el    2010-09-03 02:29:03 +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))