* nnvirtual.el (nnvirtual-request-expire-articles): Return the

list of unexpired articles.

* gnus-group.el (gnus-group-expire-articles-1): Return the list of
un-expired articles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e07bfc9..eed89c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-08-10 20:22:09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnvirtual.el (nnvirtual-request-expire-articles): Return the
+       list of unexpired articles.
+
+       * gnus-group.el (gnus-group-expire-articles-1): Return the list of
+       un-expired articles. 
+
        * gnus-sum.el (gnus-summary-reparent-thread): Narrow to the
        headers. 
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 9e23343..0f01825 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2787,7 +2787,9 @@ or nil if no action could be taken."
            (gnus-request-expire-articles
             (gnus-uncompress-sequence (cdr expirable)) group))))
        (gnus-close-group group))
-      (gnus-message 6 "Expiring articles in %s...done" group))))
+      (gnus-message 6 "Expiring articles in %s...done" group)
+      ;; Return the list of un-expired articles.
+      (cdr expirable))))
 
 (defun gnus-group-expire-all-groups ()
   "Expire all expirable articles in all newsgroups."

diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index b1d0093..5793573 100644 (file)
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -367,8 +367,15 @@ component group will show up when you enter the virtual group.")
   (nnvirtual-possibly-change-server server)
   (setq nnvirtual-component-groups
        (delete (nnvirtual-current-group) nnvirtual-component-groups))
-  (dolist (group nnvirtual-component-groups)
-    (gnus-group-expire-articles-1 group)))
+  (let (unexpired)
+    (dolist (group nnvirtual-component-groups)
+      (setq unexpired (nconc unexpired
+                            (mapcar
+                             #'(lambda (article)
+                                 (nnvirtual-reverse-map-article
+                                  group article))
+                             (gnus-group-expire-articles-1 group)))))
+    (sort unexpired '<)))
 
 \f
 ;;; Internal functions.