From: hmurata <hmurata>
Date: Wed, 20 Aug 2003 03:07:45 +0000 (+0000)
Subject: * elmo.el (elmo-folder-move-messages): Removed unused arguments.
X-Git-Tag: wl-2_11_9~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4cc1db42dcee5928cf359133047c88ede4cdd5c3;p=elisp%2Fwanderlust.git

* elmo.el (elmo-folder-move-messages): Removed unused arguments.

* elmo-pipe.el (elmo-pipe-drain): Follow the change above.

* wl-summary.el (wl-summary-buffer-msgdb): Abolish.

* wl-expire.el (wl-expire-refile): Follow the API change on
`elmo-folder-move-messages'.
(wl-expire-refile-with-copy-reserve-msg): Ditto.

* wl-action.el (wl-summary-move-mark-list-messages): Ditto.
(wl-summary-exec-action-refile): Ditto.
(wl-summary-exec-action-copy): Ditto.
(wl-summary-no-auto-refile-message-p): No use
`wl-summary-buffer-msgdb'.
(wl-summary-auto-refile): Ditto.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 556df11..f6b5417 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -2,6 +2,10 @@
 
 	* elmo-version.el (elmo-version): Up to 2.11.8.
 
+	* elmo.el (elmo-folder-move-messages): Removed unused arguments.
+
+	* elmo-pipe.el (elmo-pipe-drain): Follow the change above.
+
 2003-08-14  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo.el (elmo-folder-detach-messages): Undo last change.
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 2840857..8b645c8 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -122,8 +122,7 @@
 			     "Copying messages..."
 			   "Moving messages...")))
     (unwind-protect
-	(elmo-folder-move-messages src msgs dst
-				   nil nil copy)
+	(elmo-folder-move-messages src msgs dst copy)
       (elmo-progress-clear 'elmo-folder-move-messages))
     (when (and copy msgs)
       (setq ignore-list (elmo-number-set-append-list ignore-list
diff --git a/elmo/elmo.el b/elmo/elmo.el
index 5d187d9..ef9a950 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1071,11 +1071,9 @@ NUMBERS is a list of message numbers, messages are searched from the list."
 
 ;; Arguments should be reduced.
 (defun elmo-folder-move-messages (src-folder msgs dst-folder
-					     &optional msgdb
-					     no-delete-info
+					     &optional
 					     no-delete
-					     same-number
-					     save-unread)
+					     same-number)
   (save-excursion
     (let* ((messages msgs)
 	   (elmo-inhibit-display-retrieval-progress t)
diff --git a/wl/ChangeLog b/wl/ChangeLog
index ae77514..c65e80d 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -2,6 +2,19 @@
 
 	* Version number is increased to 2.11.8.
 
+	* wl-summary.el (wl-summary-buffer-msgdb): Abolish.
+
+	* wl-expire.el (wl-expire-refile): Follow the API change on
+	`elmo-folder-move-messages'.
+	(wl-expire-refile-with-copy-reserve-msg): Ditto.
+
+	* wl-action.el (wl-summary-move-mark-list-messages): Ditto.
+	(wl-summary-exec-action-refile): Ditto.
+	(wl-summary-exec-action-copy): Ditto.
+	(wl-summary-no-auto-refile-message-p): No use
+	`wl-summary-buffer-msgdb'.
+	(wl-summary-auto-refile): Ditto.
+
 2003-08-19  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-summary.el (wl-summary-sync): Fix regexp for last: and first:.
diff --git a/wl/wl-action.el b/wl/wl-action.el
index a77b6c6..34cd47a 100644
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -292,12 +292,7 @@ Return number if put mark succeed"
 			  refiles
 			  (if (eq folder-name 'null)
 			      'null
-			    (wl-folder-get-elmo-folder folder-name))
-			  (wl-summary-buffer-msgdb)
-			  (not (null (cdr dst-msgs)))
-			  nil ; no-delete
-			  nil ; same-number
-			  t))
+			    (wl-folder-get-elmo-folder folder-name))))
 	  (error nil))
 	(when result		; succeeded.
 	  ;; update buffer.
@@ -476,13 +471,7 @@ Return number if put mark succeed"
 	    (setq result (elmo-folder-move-messages
 			  wl-summary-buffer-elmo-folder
 			  (cdr (car dst-msgs))
-			  (wl-folder-get-elmo-folder
-			   (car (car dst-msgs)))
-			  (wl-summary-buffer-msgdb)
-			  (not (null (cdr dst-msgs)))
-			  nil ; no-delete
-			  nil ; same-number
-			  t))
+			  (wl-folder-get-elmo-folder (car (car dst-msgs)))))
 	  (error nil))
 	(if result		; succeeded.
 	    (progn
@@ -520,15 +509,10 @@ Return number if put mark succeed"
 	(setq result nil)
 	(condition-case nil
 	    (setq result (elmo-folder-move-messages
-			    wl-summary-buffer-elmo-folder
-			    (cdr (car dst-msgs))
-			    (wl-folder-get-elmo-folder
-			     (car (car dst-msgs)))
-			    (wl-summary-buffer-msgdb)
-			    (not (null (cdr dst-msgs)))
-			    t ; t is no-delete (copy)
-			    nil ; same-number
-			    t))
+			  wl-summary-buffer-elmo-folder
+			  (cdr (car dst-msgs))
+			  (wl-folder-get-elmo-folder (car (car dst-msgs)))
+			  'no-delete))
 	  (error nil))
 	(if result		; succeeded.
 	    (progn
@@ -802,8 +786,8 @@ Return number if put mark succeed"
       (wl-summary-prev)
     (wl-summary-next)))
 
-(defsubst wl-summary-no-auto-refile-message-p (msg)
-  (member (elmo-msgdb-get-mark (wl-summary-buffer-msgdb) msg)
+(defsubst wl-summary-no-auto-refile-message-p (number)
+  (member (elmo-message-mark wl-summary-buffer-elmo-folder number)
 	  wl-summary-auto-refile-skip-marks))
 
 (defun wl-summary-auto-refile (&optional open-all)
@@ -834,8 +818,8 @@ Return number if put mark succeed"
 		     (setq dst
 			   (wl-folder-get-realname
 			    (wl-refile-guess-by-rule
-			     (elmo-msgdb-overview-get-entity
-			      number (wl-summary-buffer-msgdb)))))
+			     (elmo-message-entity wl-summary-buffer-elmo-folder
+						  number))))
 		     (not (equal dst spec))
 		     (let ((pair (assoc dst checked-dsts))
 			   ret)
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 6291a8c..fd11f92 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -160,11 +160,8 @@
 	  (if (elmo-folder-move-messages folder
 					 refile-list
 					 dst-folder
-					 nil ; XXX
-					 t
 					 copy
-					 preserve-number
-					 wl-expire-add-seen-list)
+					 preserve-number)
 	      (progn
 		(wl-expire-append-log
 		 (elmo-folder-name-internal folder)
@@ -213,11 +210,8 @@ If REFILE-LIST includes reserve mark message, so copy."
 		    (elmo-folder-move-messages folder
 					       refile-list
 					       dst-folder
-					       nil ;
-					       t
 					       copy-reserve-message
-					       preserve-number
-					       wl-expire-add-seen-list))
+					       preserve-number))
 	    (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 fb9c830..de5e003 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -71,10 +71,6 @@
   (` (and wl-summary-buffer-elmo-folder
 	  (elmo-folder-name-internal wl-summary-buffer-elmo-folder))))
 
-(defmacro wl-summary-buffer-msgdb ()
-  (` (and wl-summary-buffer-elmo-folder
-	  (elmo-folder-msgdb wl-summary-buffer-elmo-folder))))
-
 (defvar wl-summary-buffer-disp-msg    nil)
 (defvar wl-summary-buffer-disp-folder nil)
 (defvar wl-summary-buffer-temp-mark-list nil)