X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-maildir.el;h=151a232f0ee2feff016054ab0de8b555d495d84a;hb=fb40159a1fc3d4fb1400f8fe3befb1056bc75b8c;hp=f3e7ae7b884cabe80cb95c77d5c3f472bc31a335;hpb=5ebce8693f237d040079d50e074388e5e06039c9;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index f3e7ae7..151a232 100644
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -132,7 +132,7 @@ LOCATION."
   (elmo-maildir-folder-flagged-locations-internal folder))
 
 (luna-define-method elmo-folder-msgdb-create 
-  ((folder elmo-maildir-folder) numbers seen-list)
+  ((folder elmo-maildir-folder) numbers flag-table)
   (let* ((unread-list (elmo-maildir-folder-unread-locations-internal folder))
 	 (flagged-list (elmo-maildir-folder-flagged-locations-internal folder))
 	 (len (length numbers))
@@ -213,7 +213,10 @@ LOCATION."
     (while news
       (rename-file
        (expand-file-name (car news) (expand-file-name "new" maildir))
-       (expand-file-name (concat (car news) ":2,")
+       (expand-file-name (concat
+			  (car news)
+			  (unless (string-match ":2,[A-Z]*$" (car news))
+			    ":2,"))
 			 (expand-file-name "cur" maildir)))
       (setq news (cdr news)))))
 
@@ -351,7 +354,7 @@ file name for maildir directories."
     filename))
 
 (luna-define-method elmo-folder-append-buffer ((folder elmo-maildir-folder)
-					       unread &optional number)
+					       &optional status number)
   (let ((basedir (elmo-maildir-folder-directory-internal folder))
 	(src-buf (current-buffer))
 	dst-buf filename)
@@ -471,22 +474,44 @@ file name for maildir directories."
 	  t)
       (error))))
 
-(luna-define-method elmo-folder-delete :before ((folder elmo-maildir-folder))
-  (let ((basedir (elmo-maildir-folder-directory-internal folder)))
-    (condition-case nil
-	(let ((tmp-files (directory-files
-			  (expand-file-name "tmp" basedir)
-			  t "[^.].*")))
-	  ;; Delete files in tmp.
-	  (dolist (file tmp-files)
-	    (delete-file file))
-	  (dolist (dir '("new" "cur" "tmp" "."))
-	    (setq dir (expand-file-name dir basedir))
-	    (if (not (file-directory-p dir))
-		(error nil)
-	      (elmo-delete-directory dir t)))
-	  t)
-      (error nil))))
+(luna-define-method elmo-folder-delete ((folder elmo-maildir-folder))
+  (let ((msgs (and (elmo-folder-exists-p folder)
+		   (elmo-folder-list-messages folder))))
+    (when (yes-or-no-p (format "%sDelete msgdb and substance of \"%s\"? "
+			       (if (> (length msgs) 0)
+				   (format "%d msg(s) exists. " (length msgs))
+				 "")
+			       (elmo-folder-name-internal folder)))
+      (let ((basedir (elmo-maildir-folder-directory-internal folder)))
+	(condition-case nil
+	    (let ((tmp-files (directory-files
+			      (expand-file-name "tmp" basedir)
+			      t "[^.].*")))
+	      ;; Delete files in tmp.
+	      (dolist (file tmp-files)
+		(delete-file file))
+	      (dolist (dir '("new" "cur" "tmp" "."))
+		(setq dir (expand-file-name dir basedir))
+		(if (not (file-directory-p dir))
+		    (error nil)
+		  (elmo-delete-directory dir t))))
+	  (error nil)))
+      (elmo-msgdb-delete-path folder)
+      t)))
+
+(luna-define-method elmo-folder-rename-internal ((folder elmo-maildir-folder)
+						 new-folder)
+  (let* ((old (elmo-maildir-folder-directory-internal folder))
+	 (new (elmo-maildir-folder-directory-internal new-folder))
+	 (new-dir (directory-file-name (file-name-directory new))))
+    (unless (file-directory-p old)
+      (error "No such directory: %s" old))
+    (when (file-exists-p new)
+      (error "Already exists directory: %s" new))
+    (unless (file-directory-p new-dir)
+      (elmo-make-directory new-dir))
+    (rename-file old new)
+    t))
 
 (require 'product)
 (product-provide (provide 'elmo-maildir) (require 'elmo-version))