From: hmurata <hmurata>
Date: Mon, 8 Oct 2001 08:31:33 +0000 (+0000)
Subject: * elmo.el (elmo-folder-move-messages): Removed arguments `all' and
X-Git-Tag: wl-2_7_5~4
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91d89212f38019b4c009b2f5a8fcab72ce338e18;p=elisp%2Fwanderlust.git

* elmo.el (elmo-folder-move-messages): Removed arguments `all' and
`done'.

* wl-expire.el (wl-expire-refile): Remove ALL and DONE arguments
from `elmo-folder-move-messages' caller.
(wl-expire-refile-with-copy-reserve-msg): Ditto.

* wl-summary.el (wl-summary-exec-subr): Likewise (All other
related portions are changed).
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9f2d3f2..2a85cc0 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo.el (elmo-folder-move-messages): Removed arguments `all' and
+	`done'.
+
 2001-10-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo-util.el (elmo-progress-counter-alist): New internal
diff --git a/elmo/elmo.el b/elmo/elmo.el
index a8e1d62..26a3875 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -904,7 +904,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
 
 ;; Arguments should be reduced.
 (defun elmo-folder-move-messages (src-folder msgs dst-folder
-					     &optional msgdb all done
+					     &optional msgdb
 					     no-delete-info
 					     no-delete
 					     same-number
diff --git a/wl/ChangeLog b/wl/ChangeLog
index f20f752..fd4d42c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-expire.el (wl-expire-refile): Remove ALL and DONE arguments
+	from `elmo-folder-move-messages' caller.
+	(wl-expire-refile-with-copy-reserve-msg): Ditto.
+
+	* wl-summary.el (wl-summary-exec-subr): Likewise (All other
+	related portions are changed).
+
 2001-10-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-summary.el (wl-summary-exec-subr): Setup and clear progress
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 755221f..0537bb7 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -146,7 +146,7 @@
 					 refile-list
 					 dst-folder
 					 msgdb
-					 nil nil t
+					 t
 					 copy
 					 preserve-number
 					 nil
@@ -182,7 +182,7 @@ If REFILE-LIST includes reserve mark message, so copy."
 	  (setq copy-len (length refile-list))
 	(unless (or (elmo-folder-exists-p dst-folder)
 		  (elmo-folder-create dst-folder))
-	(error "%s: create folder failed" (elmo-folder-name-internal 
+	(error "%s: create folder failed" (elmo-folder-name-internal
 					   dst-folder)))
 	(while (setq msg (wl-pop msglist))
 	  (unless (wl-expire-msg-p msg mark-alist)
@@ -202,12 +202,11 @@ If REFILE-LIST includes reserve mark message, so copy."
 					       refile-list
 					       dst-folder
 					       msgdb
-					       nil nil t
+					       t
 					       copy-reserve-message
 					       preserve-number
 					       nil
-					       wl-expire-add-seen-list
-					       ))
+					       wl-expire-add-seen-list))
 	    (error "Expire: move msgs to %s failed"
 		   (elmo-folder-name-internal dst-folder)))
 	  (wl-expire-append-log (elmo-folder-name-internal folder)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 02fcdfa..4083720 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3095,9 +3095,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 				wl-summary-unread-uncached-mark
 				wl-summary-new-mark))
 	    (refiles (append moves dels))
-	    (refile-executed 0)
 	    (refile-failures 0)
-	    (copy-executed 0)
 	    (copy-failures 0)
 	    (copy-len (length copies))
 	    refile-len
@@ -3131,8 +3129,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 			      (wl-folder-get-elmo-folder
 			       (car (car dst-msgs))))
 			    (wl-summary-buffer-msgdb)
-			    refile-len
-			    refile-executed
 			    (not (null (cdr dst-msgs)))
 			    nil ; no-delete
 			    nil ; same-number
@@ -3149,7 +3145,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 					      wl-summary-buffer-refile-list)))
 	    (setq refile-failures
 		  (+ refile-failures (length (cdr (car dst-msgs))))))
-	  (setq refile-executed (+ refile-executed (length (cdr (car dst-msgs)))))
 	  (setq dst-msgs (cdr dst-msgs)))
 	(elmo-progress-clear 'elmo-folder-move-messages)
 	;; end refile
@@ -3167,8 +3162,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 			    (wl-folder-get-elmo-folder
 			     (car (car dst-msgs)))
 			    (wl-summary-buffer-msgdb)
-			    copy-len
-			    copy-executed
 			    (not (null (cdr dst-msgs)))
 			    t ; t is no-delete (copy)
 			    nil ; same number
@@ -3185,7 +3178,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 					      wl-summary-buffer-copy-list)))
 	    (setq copy-failures
 		  (+ copy-failures (length (cdr (car dst-msgs))))))
-	  (setq copy-executed (+ copy-executed (length (cdr (car dst-msgs)))))
 	  (setq dst-msgs (cdr dst-msgs)))
 	;; Hide progress bar.
 	(elmo-progress-clear 'elmo-folder-move-messages)