gnus-html.el (gnus-html-schedule-image-fetching): Work for XEmacs.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 96e0cc20f9e..75f806c3a5c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * gnus-html.el: Don't require help-fns under XEmacs.
+        (gnus-html-schedule-image-fetching): Work for XEmacs.
+
         * mm-decode.el (mm-shr): Decode contents by charset.
 
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index d0414e78601..3ae3766ed62 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -37,7 +37,7 @@
 (require 'url-cache)
 (require 'xml)
 (require 'browse-url)
-(require 'help-fns)
+(eval-and-compile (unless (featurep 'xemacs) (require 'help-fns)))
 
 (defcustom gnus-html-image-cache-ttl (days-to-time 7)
   "Time used to determine if we should use images from the cache."
@@ -367,7 +367,10 @@ Use ALT-TEXT for the image string."
   (let ((args (list (car image)
                     'gnus-html-image-fetched
                     (list buffer image))))
-    (when (> (length (help-function-arglist 'url-retrieve)) 4)
+    (when (> (length (if (featurep 'xemacs)
+                         (split-string (function-arglist 'url-retrieve))
+                       (help-function-arglist 'url-retrieve)))
+             4)
       (setq args (nconc args (list t))))
     (apply #'url-retrieve args)))