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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66f4747..372fe9f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
 2010-10-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind libxml-parse-html-region and shr-insert-document for
-       Emacs 22 and XEmacs.
+       Emacs 22 and XEmacs; fbind help-function-arglist for XEmacs 21.4 and
+       SXEmacs.
+
+       * 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.
 

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index d0414e7..7d8c0ef 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/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,14 @@ 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 (> (if (featurep 'xemacs)
+                (1- (length
+                     (delete "&optional"
+                             (delete "&rest"
+                                     (split-string
+                                      (function-arglist 'url-retrieve))))))
+              (length (help-function-arglist 'url-retrieve)))
+            4)
       (setq args (nconc args (list t))))
     (apply #'url-retrieve args)))
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 879806f..390e3e4 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -90,10 +90,10 @@
     (maybe-fbind
      '(custom-autoload
        decode-char display-graphic-p display-images-p display-visual-class
-       get-display-table make-temp-file next-single-char-property-change
-       put-display-table select-frame-set-input-focus set-buffer-multibyte
-       string-as-multibyte timer-set-function unicode-precedence-list
-       unicode-to-char))
+       get-display-table help-function-arglist make-temp-file
+       next-single-char-property-change put-display-table
+       select-frame-set-input-focus set-buffer-multibyte string-as-multibyte
+       timer-set-function unicode-precedence-list unicode-to-char))
     (maybe-bind
      '(header-line-format
        scroll-margin timer-list)))