diff options
| author | Katsumi Yamaoka | 2010-10-07 06:47:37 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2010-10-07 06:47:37 +0000 |
| commit | 814cc274efc3002fa80122a3f5d55ed7493656c3 (patch) | |
| tree | e9dc7919ef35cd9375b858d545e09d72ea6ff95c /lisp | |
| parent | cbabe91fdce9313ffc3f72e0a828b86580661dac (diff) | |
| download | emacs-814cc274efc3002fa80122a3f5d55ed7493656c3.tar.gz emacs-814cc274efc3002fa80122a3f5d55ed7493656c3.zip | |
[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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus-gravatar.el | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-html.el | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 11c2b70fc86..65658909153 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-10-07 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 2 | |||
| 3 | * gnus-html.el (gnus-html-schedule-image-fetching): Remove function | ||
| 4 | name from XEmacs' function-arglist. | ||
| 5 | |||
| 6 | * gnus-gravatar.el (gnus-gravatar-insert): Don't add properties to | ||
| 7 | gravatar under XEmacs. | ||
| 8 | |||
| 1 | 2010-10-07 Teodor Zlatanov <tzz@lifelogs.com> | 9 | 2010-10-07 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 10 | ||
| 3 | * auth-source.el: Update docs with TODO items. | 11 | * auth-source.el: Update docs with TODO items. |
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el index de373cfdf05..ecd9f753f5e 100644 --- a/lisp/gnus/gnus-gravatar.el +++ b/lisp/gnus/gnus-gravatar.el | |||
| @@ -84,10 +84,9 @@ Set image category to CATEGORY." | |||
| 84 | ;; another mail with the same someaddress. | 84 | ;; another mail with the same someaddress. |
| 85 | (unless (memq 'gnus-gravatar (text-properties-at (point))) | 85 | (unless (memq 'gnus-gravatar (text-properties-at (point))) |
| 86 | (let ((inhibit-read-only t) | 86 | (let ((inhibit-read-only t) |
| 87 | (point (point)) | 87 | (point (point))) |
| 88 | (gravatar (append | 88 | (unless (featurep 'xemacs) |
| 89 | gravatar | 89 | (setq gravatar (append gravatar gnus-gravatar-properties))) |
| 90 | gnus-gravatar-properties))) | ||
| 91 | (gnus-put-image gravatar nil category) | 90 | (gnus-put-image gravatar nil category) |
| 92 | (put-text-property point (point) 'gnus-gravatar address) | 91 | (put-text-property point (point) 'gnus-gravatar address) |
| 93 | (gnus-add-wash-type category) | 92 | (gnus-add-wash-type category) |
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index a21c4784d80..c1472118cf8 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el | |||
| @@ -361,7 +361,7 @@ Use ALT-TEXT for the image string." | |||
| 361 | 'gnus-html-image-fetched | 361 | 'gnus-html-image-fetched |
| 362 | (list buffer image)))) | 362 | (list buffer image)))) |
| 363 | (when (> (length (if (featurep 'xemacs) | 363 | (when (> (length (if (featurep 'xemacs) |
| 364 | (split-string (function-arglist 'url-retrieve)) | 364 | (cdr (split-string (function-arglist 'url-retrieve))) |
| 365 | (help-function-arglist 'url-retrieve))) | 365 | (help-function-arglist 'url-retrieve))) |
| 366 | 4) | 366 | 4) |
| 367 | (setq args (nconc args (list t)))) | 367 | (setq args (nconc args (list t)))) |