[Emacs-diffs] /srv/bzr/emacs/trunk r101828: [Gnus] Enable XEmacs to display images.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101828
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-07 06:47:37 +0000
message:
  [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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-gravatar.el
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-07 03:49:38 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-07 06:47:37 +0000
@@ -1,3 +1,11 @@
+2010-10-07  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * auth-source.el: Update docs with TODO items.

=== modified file 'lisp/gnus/gnus-gravatar.el'
--- a/lisp/gnus/gnus-gravatar.el        2010-10-03 00:33:27 +0000
+++ b/lisp/gnus/gnus-gravatar.el        2010-10-07 06:47:37 +0000
@@ -84,10 +84,9 @@
           ;; 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)

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-10-05 22:43:06 +0000
+++ b/lisp/gnus/gnus-html.el    2010-10-07 06:47:37 +0000
@@ -361,7 +361,7 @@
                    '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))))