X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-mark.el;h=02cdde2a66a7053d24895649a0dc8d99ae597a71;hb=c6930bb696cf4a9e6f2d07c5620e4392f5a4773d;hp=5f5b0f906e63fbec9e2596ef5b557bd0153bb2d5;hpb=51f9787799e1f8a5ad1f9cde0fd99489dae071c3;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-mark.el b/elmo/elmo-mark.el
index 5f5b0f9..02cdde2 100644
--- a/elmo/elmo-mark.el
+++ b/elmo/elmo-mark.el
@@ -56,7 +56,7 @@
 						    elmo-mark-folder))
   (expand-file-name "mark"
 		    (expand-file-name "internal"
-				      elmo-msgdb-dir)))
+				      elmo-msgdb-directory)))
 
 (luna-define-method elmo-map-folder-list-message-locations
   ((folder elmo-mark-folder))
@@ -69,7 +69,7 @@
 			    (elmo-object-load
 			     (expand-file-name
 			      elmo-msgdb-global-mark-filename
-			      elmo-msgdb-dir)))))
+			      elmo-msgdb-directory)))))
       (if (string= (elmo-mark-folder-mark-internal folder)
 		   (cdr pair))
 	  (setq result (cons (car pair) result))))
@@ -164,29 +164,6 @@
 (luna-define-method elmo-folder-writable-p ((folder elmo-mark-folder))
   t)
 
-(luna-define-method elmo-folder-search ((folder elmo-mark-folder)
-					condition &optional from-msgs)
-  (let* ((msgs (or from-msgs (elmo-folder-list-messages folder)))
-	 (number-list msgs)
-	 (i 0)
-	 (num (length msgs))
-	 file
-	 matched
-	 case-fold-search)
-    (while msgs
-      (if (and (setq file (elmo-message-file-name folder (car msgs)))
-	       (file-exists-p file)
-	       (elmo-file-field-condition-match file
-						condition
-						(car msgs)
-						number-list))
-	  (setq matched (nconc matched (list (car msgs)))))
-      (elmo-display-progress
-       'elmo-internal-folder-search "Searching..."
-       (/ (* (setq i (1+ i)) 100) num))
-      (setq msgs (cdr msgs)))
-    matched))
-
 ;;; To override elmo-map-folder methods.
 (luna-define-method elmo-folder-list-unreads-internal
   ((folder elmo-mark-folder) unread-marks &optional mark-alist)