[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 11c2b70fc865d3fc2ba88e28978e750aaa4f09d4..656589091536f7068832ba66984c0f6a4cbf4db8 100644 (file)
--- 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 de373cfdf051cb41cafa074bf1dd99df627fd279..ecd9f753f5eb71e5f1c0ea8914ab3035910a9894 100644 (file)
--- 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 a21c4784d80d5f066902fba96a7186be106dd05f..c1472118cf83256ac6414203900b5c29c071ccf9 100644 (file)
--- 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))))