From: yamaoka <yamaoka>
Date: Wed, 5 Feb 2003 23:41:32 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_16-00-quimby~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1092bd26ccbe6eba304b8363d866f723bc208a;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86c5ae7..c99964d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-agent.el (gnus-agent-expire-1,2): Pass the dir argument
+	from g-a-e-1 to g-a-e-2.
+
 2003-02-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-check-BBDB): no need to regexp-quote the argument
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 12338f1..14506d5 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -2135,7 +2135,8 @@ return only unread articles."
   (or (gnus-gethash group gnus-category-group-cache)
       (assq 'default gnus-category-alist)))
 
-(defun gnus-agent-expire-2 (expiring-group active articles overview day force)
+(defun gnus-agent-expire-2 (expiring-group active articles overview day force
+					   dir)
   (gnus-agent-load-alist expiring-group)
   (gnus-message 5 "Expiring articles in %s" expiring-group)
   (let* ((info (gnus-get-info expiring-group))
@@ -2452,7 +2453,8 @@ See `gnus-agent-expire'."
 
 		      (when active
 			(gnus-agent-expire-2 expiring-group active
-					     articles overview day force)))))))
+					     articles overview day force
+					     dir)))))))
 	(kill-buffer overview)))))
 
 (defun gnus-agent-expire (&optional articles group force)