X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=wl%2Fwl-expire.el;h=d3f2b945bc7817ec6bbc9d99a6ef9aea94aa1b63;hb=8411f54bea43e3cc31632ec94c9777724516d1de;hp=f3f20b362278c252d2c2ccc1a441c151d1edae39;hpb=fcdc9032735042361ec75b98f6b72bab79af47fb;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index f3f20b3..d3f2b94 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -149,7 +149,6 @@
 					 t
 					 copy
 					 preserve-number
-					 nil
 					 wl-expire-add-seen-list)
 	      (progn
 		(wl-expire-append-log
@@ -205,7 +204,6 @@ If REFILE-LIST includes reserve mark message, so copy."
 					       t
 					       copy-reserve-message
 					       preserve-number
-					       nil
 					       wl-expire-add-seen-list))
 	    (error "Expire: move msgs to %s failed"
 		   (elmo-folder-name-internal dst-folder)))
@@ -813,7 +811,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
   (interactive "P")
   (let* ((folder (or folder wl-summary-buffer-elmo-folder))
 	 (msgdb (or (wl-summary-buffer-msgdb)
-		    (elmo-msgdb-load folder)))
+		    (elmo-folder-msgdb folder)))
 	 (msgs (if (not nolist)
 		   (elmo-folder-list-messages folder)
 		 (mapcar 'car (elmo-msgdb-get-number-alist msgdb))))
@@ -880,7 +878,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
 	(if (file-writable-p filename)
 	    (write-region (point-min) (point-max)
 			  filename t 'no-msg)
-	  (message (format "%s is not writable." filename)))
+	  (message "%s is not writable." filename))
 	(kill-buffer tmp-buf)))))
 
 (require 'product)