summaryrefslogtreecommitdiff
path: root/lisp/gnus/gravatar.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2011-01-24 04:10:19 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-01-24 04:10:19 +0000
commitcb51ba085d2250e2487fbdc30edcb1f049d040d7 (patch)
tree4190b92176f75313f1b62ddfe1e3bcdc2747d2b6 /lisp/gnus/gravatar.el
parentb711096ad269e09e750449db68ded5e6729c17c1 (diff)
downloademacs-cb51ba085d2250e2487fbdc30edcb1f049d040d7.tar.gz
emacs-cb51ba085d2250e2487fbdc30edcb1f049d040d7.tar.bz2
emacs-cb51ba085d2250e2487fbdc30edcb1f049d040d7.zip
gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
shr.el (shr-image-fetched): Ditto. shr.el (shr-image-fetched): Avoid having point move in the article buffer. gnus-html.el (gnus-html-image-fetched): Kill the buffer anyway, and fix the bug in url-http.el instead. shr.el (shr-image-fetched): Ditto. gravatar.el (gravatar-retrieve): Be silent when retrieving. gnus-gravatar.el (gnus-gravatar-insert): Don't move point around in the article buffer. (gnus-gravatar-insert): Use blank space from the current buffer to avoid breaking text properties. This makes X-Sent updating work again. gnus-art.el (gnus-article-read-summary-keys): Don't call disabled commands.
Diffstat (limited to 'lisp/gnus/gravatar.el')
-rw-r--r--lisp/gnus/gravatar.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index 158347fb004..cb857fca89b 100644
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -108,9 +108,15 @@ If no image available, return 'error."
You can provide a list of argument to pass to CB in CBARGS."
(let ((url (gravatar-build-url mail-address)))
(if (gravatar-cache-expired url)
- (url-retrieve url
- 'gravatar-retrieved
- (list cb (when cbargs cbargs)))
+ (let ((args (list url
+ 'gravatar-retrieved
+ (list cb (when cbargs cbargs)))))
+ (when (> (length (if (featurep 'xemacs)
+ (cdr (split-string (function-arglist 'url-retrieve)))
+ (help-function-arglist 'url-retrieve)))
+ 4)
+ (setq args (nconc args (list t))))
+ (apply #'url-retrieve args))
(apply cb
(with-temp-buffer
(mm-disable-multibyte)