Mercurial > emacs
comparison lisp/gnus/gnus-topic.el @ 110698:74bad2d7bddd
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.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sat, 02 Oct 2010 10:30:06 +0000 |
parents | 2b8ece636433 |
children | 65a8bf3768b2 |
comparison
equal
deleted
inserted
replaced
110697:0186f2ee32d8 | 110698:74bad2d7bddd |
---|---|
1300 "Move the next N groups to TOPIC. | 1300 "Move the next N groups to TOPIC. |
1301 If COPYP, copy the groups instead." | 1301 If COPYP, copy the groups instead." |
1302 (interactive | 1302 (interactive |
1303 (list current-prefix-arg | 1303 (list current-prefix-arg |
1304 (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t | 1304 (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t |
1305 'gnus-topic-history))) | 1305 nil 'gnus-topic-history))) |
1306 (let ((use-marked (and (not n) (not (gnus-region-active-p)) | 1306 (let ((use-marked (and (not n) (not (gnus-region-active-p)) |
1307 gnus-group-marked t)) | 1307 gnus-group-marked t)) |
1308 (groups (gnus-group-process-prefix n)) | 1308 (groups (gnus-group-process-prefix n)) |
1309 (topicl (assoc topic gnus-topic-alist)) | 1309 (topicl (assoc topic gnus-topic-alist)) |
1310 (start-topic (gnus-group-topic-name)) | 1310 (start-topic (gnus-group-topic-name)) |
1346 | 1346 |
1347 (defun gnus-topic-copy-group (n topic) | 1347 (defun gnus-topic-copy-group (n topic) |
1348 "Copy the current group to a topic." | 1348 "Copy the current group to a topic." |
1349 (interactive | 1349 (interactive |
1350 (list current-prefix-arg | 1350 (list current-prefix-arg |
1351 (gnus-completing-read "Copy to topic" (mapcar 'car gnus-topic-alist) t))) | 1351 (gnus-completing-read |
1352 "Copy to topic" (mapcar 'car gnus-topic-alist) t))) | |
1352 (gnus-topic-move-group n topic t)) | 1353 (gnus-topic-move-group n topic t)) |
1353 | 1354 |
1354 (defun gnus-topic-kill-group (&optional n discard) | 1355 (defun gnus-topic-kill-group (&optional n discard) |
1355 "Kill the next N groups." | 1356 "Kill the next N groups." |
1356 (interactive "P") | 1357 (interactive "P") |