From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Fri, 3 Sep 2010 02:29:03 +0000 (+0000)
Subject: Make gnus-html work for XEmacs.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73137971949d98417140a39450c8154101ebfe87;p=emacs.git

Make gnus-html work for XEmacs.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2ce91eedc3e..55b59c8d6bc 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 711cd3810d4..399676f0600 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -242,11 +242,13 @@ fit these criteria."
 	(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
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 417cf6cdf84..7cdb70a3580 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1580,11 +1580,9 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
    (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))