diff options
| author | Gnus developers <ding@gnus.org> | 2011-03-18 13:45:04 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-03-18 13:45:04 +0000 |
| commit | 1518e4f02dab44ba5388cd8b0699749ee30d3eff (patch) | |
| tree | 6097746516e201f86c3d5c72394dc6cf941e23ac /lisp/gnus/gravatar.el | |
| parent | fffe2e140420f75d6ad06ab9356b337570572b9b (diff) | |
| download | emacs-1518e4f02dab44ba5388cd8b0699749ee30d3eff.tar.gz emacs-1518e4f02dab44ba5388cd8b0699749ee30d3eff.tar.bz2 emacs-1518e4f02dab44ba5388cd8b0699749ee30d3eff.zip | |
Merge changes made in Gnus trunk.
message.texi (Various Commands): Document format specs in the ellipsis.
time-date.el (format-seconds): Use assoc instead of assoc-string to avoid warning on XEmacs.
gnus-art.el: Require mouse, which the build bot seems to say is needed.
gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously.
time-date.el (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs.
gnus-group.el (gnus-group-list-ticked): New function.
(gnus-group-make-menu-bar): Provide a menu entry for it.
(gnus-group-list-map): Provide a binding for it.
shr.el (shr-visit-file): New command.
nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch.
nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable servers.
Diffstat (limited to 'lisp/gnus/gravatar.el')
| -rw-r--r-- | lisp/gnus/gravatar.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el index 0c97080d847..4b0c9a16283 100644 --- a/lisp/gnus/gravatar.el +++ b/lisp/gnus/gravatar.el @@ -129,8 +129,10 @@ You can provide a list of argument to pass to CB in CBARGS." "Retrieve MAIL-ADDRESS gravatar and returns it." (let ((url (gravatar-build-url mail-address))) (if (gravatar-cache-expired url) - (with-current-buffer (url-retrieve-synchronously url) - (when gravatar-automatic-caching + (with-current-buffer (if (featurep 'xemacs) + (url-retrieve url) + (url-retrieve-synchronously url)) + (when gravatar-automatic-caching (url-store-in-cache (current-buffer))) (let ((data (gravatar-data->image))) (kill-buffer (current-buffer)) |