mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes made in Gnus trunk.

Browse source 
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.
This commit is contained in:
Lars Magne Ingebrigtsen 2010-10-02 10:30:06 +00:00 • committed by Katsumi Yamaoka
parent 644d0594a5
commit 367f7f81d1
4 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/gnus/gnus-html.el
View file

@ -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."