diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-10-02 10:30:06 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-02 10:30:06 +0000 |
| commit | 367f7f81d1923c6418c4d5beb04144d3dbef476a (patch) | |
| tree | f71d5e987039bdc73779bc5ed8f4a08c01faa41b /lisp/gnus/gnus-html.el | |
| parent | 644d0594a55a5fd81efc40aa9cba0981a2563aa8 (diff) | |
| download | emacs-367f7f81d1923c6418c4d5beb04144d3dbef476a.tar.gz emacs-367f7f81d1923c6418c4d5beb04144d3dbef476a.tar.bz2 emacs-367f7f81d1923c6418c4d5beb04144d3dbef476a.zip | |
Merge changes made in Gnus trunk.
gnus-topic.el (gnus-topic-move-group): Fix the syntax of the completing read.
gnus-html.el (gnus-html-schedule-image-fetching): Be silent.
shr.el: New file.
Diffstat (limited to 'lisp/gnus/gnus-html.el')
| -rw-r--r-- | lisp/gnus/gnus-html.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index fee9eee0f9e..0b64a237426 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -37,6 +37,7 @@ (require 'url-cache) (require 'xml) (require 'browse-url) +(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." @@ -368,10 +369,12 @@ Use ALT-TEXT for the image string." "Retrieve IMAGE, and place it into BUFFER on arrival." (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, image %s" buffer image) - (ignore-errors - (url-retrieve (car image) - 'gnus-html-image-fetched - (list buffer image)))) + (let ((args (list (car image) + 'gnus-html-image-fetched + (list buffer image)))) + (when (> (length (help-function-arglist 'url-retrieve)) 4) + (setq args (nconc args (list t)))) + (apply #'url-retrieve args))) (defun gnus-html-image-fetched (status buffer image) "Callback function called when image has been fetched." |