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-topic.el | |
| parent | 644d0594a55a5fd81efc40aa9cba0981a2563aa8 (diff) | |
| download | emacs-367f7f81d1923c6418c4d5beb04144d3dbef476a.tar.gz | |
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-topic.el')
| -rw-r--r-- | lisp/gnus/gnus-topic.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index b600fac3533..efa543f68d6 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/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) |