From 828deffe1d33f243ae4116d4f2b6ff5f3924eb29 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 24 Jun 2003 00:04:16 +0000 Subject: [PATCH] Synch to Gnus 200306240002. --- lisp/ChangeLog | 4 ++++ lisp/gnus-group.el | 44 +++++++++++++++++++++----------------------- lisp/gnus-topic.el | 4 ++-- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a09c915..7b27ede 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-06-24 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-group-kill-group): Clean up. + 2003-06-23 Teodor Zlatanov * spam.el (spam-from-listed-p, spam-parse-list): use diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index ca1bbac..92362fb 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -3407,29 +3407,27 @@ of groups killed." (message "Killed group %s" group)) ;; If there are lots and lots of groups to be killed, we use ;; this thing instead. - (let (entry) - (setq groups (nreverse groups)) - (while groups - (gnus-group-remove-mark (setq group (pop groups))) - (gnus-delete-line) - (push group gnus-killed-list) - (setq gnus-newsrc-alist - (delq (assoc group gnus-newsrc-alist) - gnus-newsrc-alist)) - (when gnus-group-change-level-function - (funcall gnus-group-change-level-function - group gnus-level-killed 3)) - (cond - ((setq entry (gnus-gethash group gnus-newsrc-hashtb)) - (push (cons (car entry) (nth 2 entry)) - gnus-list-of-killed-groups) - (setcdr (cdr entry) (cdddr entry))) - ((member group gnus-zombie-list) - (setq gnus-zombie-list (delete group gnus-zombie-list)))) - ;; There may be more than one instance displayed. - (while (gnus-group-goto-group group) - (gnus-delete-line))) - (gnus-make-hashtable-from-newsrc-alist))) + (dolist (group (nreverse groups)) + (gnus-group-remove-mark group) + (gnus-delete-line) + (push group gnus-killed-list) + (setq gnus-newsrc-alist + (delq (assoc group gnus-newsrc-alist) + gnus-newsrc-alist)) + (when gnus-group-change-level-function + (funcall gnus-group-change-level-function + group gnus-level-killed 3)) + (cond + ((setq entry (gnus-gethash group gnus-newsrc-hashtb)) + (push (cons (car entry) (nth 2 entry)) + gnus-list-of-killed-groups) + (setcdr (cdr entry) (cdddr entry))) + ((member group gnus-zombie-list) + (setq gnus-zombie-list (delete group gnus-zombie-list)))) + ;; There may be more than one instance displayed. + (while (gnus-group-goto-group group) + (gnus-delete-line))) + (gnus-make-hashtable-from-newsrc-alist)) (gnus-group-position-point) (if (< (length out) 2) (car out) (nreverse out)))) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 07d501c..002a3a3 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -928,8 +928,8 @@ articles in the topic and its subtopics." ? )) (yanked (list group)) alist talist end) - ;; Then we enter the yanked groups into the topics they belong - ;; to. + ;; Then we enter the yanked groups into the topics + ;; they belong to. (when (setq alist (assoc (save-excursion (forward-line -1) (or -- 1.7.10.4