From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 7 Oct 2010 06:47:37 +0000 (+0000)
Subject: [Gnus] Enable XEmacs to display images.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~146
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=814cc274efc3002fa80122a3f5d55ed7493656c3;p=emacs.git

[Gnus] Enable XEmacs to display images.

gnus-html.el (gnus-html-schedule-image-fetching): Remove function name from XEmacs' function-arglist.
gnus-gravatar.el (gnus-gravatar-insert): Don't add properties to gravatar under XEmacs.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 11c2b70fc86..65658909153 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Remove function
+	name from XEmacs' function-arglist.
+
+	* gnus-gravatar.el (gnus-gravatar-insert): Don't add properties to
+	gravatar under XEmacs.
+
 2010-10-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* auth-source.el: Update docs with TODO items.
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index de373cfdf05..ecd9f753f5e 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -84,10 +84,9 @@ Set image category to CATEGORY."
           ;; another mail with the same someaddress.
           (unless (memq 'gnus-gravatar (text-properties-at (point)))
             (let ((inhibit-read-only t)
-                  (point (point))
-                  (gravatar (append
-                             gravatar
-                             gnus-gravatar-properties)))
+                  (point (point)))
+	      (unless (featurep 'xemacs)
+		(setq gravatar (append gravatar gnus-gravatar-properties)))
               (gnus-put-image gravatar nil category)
               (put-text-property point (point) 'gnus-gravatar address)
               (gnus-add-wash-type category)
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index a21c4784d80..c1472118cf8 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -361,7 +361,7 @@ Use ALT-TEXT for the image string."
 		    'gnus-html-image-fetched
 		    (list buffer image))))
     (when (> (length (if (featurep 'xemacs)
-			 (split-string (function-arglist 'url-retrieve))
+			 (cdr (split-string (function-arglist 'url-retrieve)))
 		       (help-function-arglist 'url-retrieve)))
 	     4)
       (setq args (nconc args (list t))))