X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-archive.el;h=2fb1c3c72afec9a7a3edb71a05f63aeec2e9a063;hb=a5bcb1f0eb41b558a6b4ed277047adc6b8676a2a;hp=eb94d29bb53378937afb325ada22d6ea6f5b1e95;hpb=0c41af317b9692277c3871b9c8cd106d648f9772;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index eb94d29..2fb1c3c 100644
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -447,12 +447,20 @@ TYPE specifies the archiver's symbol."
 	     (delete-file dummy)))
        ))))
 
-(luna-define-method elmo-folder-delete :before ((folder elmo-archive-folder))
-  (let ((arc (elmo-archive-get-archive-name folder)))
-    (if (not (file-exists-p arc))
-	(error "No such file: %s" arc)
-      (delete-file arc)
-      t)))
+(luna-define-method elmo-folder-delete ((folder elmo-archive-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 ((arc (elmo-archive-get-archive-name folder)))
+	(if (not (file-exists-p arc))
+	    (error "No such file: %s" arc)
+	  (delete-file arc))
+	(elmo-msgdb-delete-path folder)
+	t))))
 
 (luna-define-method elmo-folder-rename-internal ((folder elmo-archive-folder)
 						 new-folder)