From c393c1f69945f6174b219780dde2e0517c8369da Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sat, 2 Oct 2010 04:20:45 +0200 Subject: [PATCH] * gnus-topic.el (gnus-topic-move-group): Fix the syntax of the completing read. * gnus-html.el (gnus-html-schedule-image-fetching): Be silent. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-html.el | 11 +++++++---- lisp/gnus-topic.el | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b5433b0e..20ccfed5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-10-02 Lars Magne Ingebrigtsen + + * gnus-html.el (gnus-html-schedule-image-fetching): Be silent. + + * gnus-topic.el (gnus-topic-move-group): Fix the syntax of the + completing read. + 2010-10-01 Lars Magne Ingebrigtsen * gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el index fee9eee0f..0b64a2374 100644 --- a/lisp/gnus-html.el +++ b/lisp/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." diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index b600fac35..efa543f68 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1302,7 +1302,7 @@ If COPYP, copy the groups instead." (interactive (list current-prefix-arg (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t - 'gnus-topic-history))) + nil 'gnus-topic-history))) (let ((use-marked (and (not n) (not (gnus-region-active-p)) gnus-group-marked t)) (groups (gnus-group-process-prefix n)) @@ -1348,7 +1348,8 @@ If COPYP, copy the groups instead." "Copy the current group to a topic." (interactive (list current-prefix-arg - (gnus-completing-read "Copy to topic" (mapcar 'car gnus-topic-alist) t))) + (gnus-completing-read + "Copy to topic" (mapcar 'car gnus-topic-alist) t))) (gnus-topic-move-group n topic t)) (defun gnus-topic-kill-group (&optional n discard) -- 2.25.1