From: yamaoka <yamaoka>
Date: Sun, 9 Jun 2002 23:14:32 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_7-02-quimby~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=915fcb572d9946125be788e37d6457b442b9bbb3;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dd4e76..5284f1a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10  Simon Josefsson  <jas@extundo.com>
+
+	* gnus-int.el (gnus-request-expire-articles): Fix last change?
+
 2002-06-09  Simon Josefsson  <jas@extundo.com>
 
 	* gnus-sum.el (gnus-summary-delete-article): Don't agent expire here.
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index a4a9b1f..ae97600 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -485,16 +485,16 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 	     info (nth 1 gnus-command-method))))
 
 (defun gnus-request-expire-articles (articles group &optional force)
-  (let ((gnus-command-method (gnus-find-method-for-group group))
-	(not-deleted
-	 (funcall
-	  (gnus-get-function gnus-command-method 'request-expire-articles)
-	  articles (gnus-group-real-name group) (nth 1 gnus-command-method)
-	  force)))
+  (let* ((gnus-command-method (gnus-find-method-for-group group))
+	 (not-deleted
+	  (funcall
+	   (gnus-get-function gnus-command-method 'request-expire-articles)
+	   articles (gnus-group-real-name group) (nth 1 gnus-command-method)
+	   force)))
     (when (and gnus-agent gnus-agent-cache
 	       (gnus-sorted-difference articles not-deleted))
       (gnus-agent-expire (gnus-sorted-difference articles not-deleted)
-			 gnus-newsgroup-name 'force))
+			 group 'force))
     not-deleted))
 
 (defun gnus-request-move-article