From: yamaoka <yamaoka>
Date: Tue, 23 Jul 2002 22:44:20 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-00-quimby~16
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=fbdcf265c96437a2585053c0739f4080ffc1e149;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ebd664..008e924 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-23  Karl Kleinpaste  <karl@charcoal.com>
+
+	* gnus-sum.el (gnus-summary-delete-article): Force
+	nnmail-expiry-target to 'delete, so that absolute deletion
+	happens when absolute deletion is requested.
+
 2002-07-21  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 	From Nevin Kapur <nevin@jhu.edu>.
 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 2daea65..63a8511 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8988,9 +8988,7 @@ 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))
+	(nnmail-expiry-target 'delete)
 	not-deleted)
     (if (and gnus-novice-user
 	     (not (gnus-yes-or-no-p