Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ce5439..5466912 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-09  Nevin Kapur  <Nevin Kapur <nevin@jhu.edu>
+
+       * gnus-sum.el (gnus-summary-delete-article): Respect group
+       parameters while expiring.
+
 2002-07-08  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (article-make-date-line): Fix string.  From Henrik

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index ff45117..6315261 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8977,6 +8977,9 @@ delete these instead."
     (error "Couldn't open server"))
   ;; Compute the list of articles to delete.
   (let ((articles (sort (copy-sequence (gnus-summary-work-articles n)) '<))
+       (nnmail-expiry-target
+        (or (gnus-group-find-parameter gnus-newsgroup-name 'expiry-target)
+            nnmail-expiry-target))
        not-deleted)
     (if (and gnus-novice-user
             (not (gnus-yes-or-no-p