[Emacs-diffs] /srv/bzr/emacs/trunk r101796: gnus-html.el (gnus-html-schedule-image-fetching): Work for XEmacs.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101796
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-05 03:48:30 +0000
message:
  gnus-html.el (gnus-html-schedule-image-fetching): Work for XEmacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-05 02:08:37 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-05 03:48:30 +0000
@@ -1,5 +1,8 @@
 2010-10-05  Katsumi Yamaoka  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-10-04 10:16:57 +0000
+++ b/lisp/gnus/gnus-html.el    2010-10-05 03:48:30 +0000
@@ -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 @@
   (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)))