X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-folder.el;h=30b17d6e6b2f0c2c5d74493ab2a4719038cda1fb;hb=7754057708758a95d3f54a0725bd6ca99225e502;hp=2513336decd6a8ecde9894f5d150032cff68721b;hpb=6ee2df2d9ba35b5961d631bee2d6133cf6c3746e;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 2513336..30b17d6 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -249,7 +249,8 @@
     (regexp-quote group) ":[-0-9-]+/[0-9-]+/[0-9-]+") nil t))
 
 (defun wl-folder-buffer-search-entity (folder &optional searchname)
-  (let ((search (or searchname (wl-folder-get-petname folder))))
+  (let ((search (or searchname (wl-folder-get-petname folder)))
+	case-fold-search)
     (re-search-forward
      (concat
       "^[ \t]*"
@@ -292,7 +293,7 @@
 (defmacro wl-folder-set-entity-info (entity value &optional hashtb)
   (` (let* ((hashtb (or (, hashtb) wl-folder-entity-hashtb))
 	    (info (wl-folder-get-entity-info (, entity) hashtb)))
-       (elmo-set-hash-val (, entity)
+       (elmo-set-hash-val (elmo-string (, entity))
 			  (if (< (length (, value)) 4)
 			      (append (, value) (list (nth 3 info)))
 			    (, value))
@@ -316,16 +317,6 @@
 		 (setq li (cdr li))))))))
 
 ;;; ELMO folder structure with cache.
-(defmacro wl-folder-get-elmo-folder (entity &optional no-cache)
-  "Get elmo folder structure from entity."
-  (` (if (, no-cache)
-	 (elmo-make-folder (elmo-string (, entity)))
-       (or (wl-folder-elmo-folder-cache-get (, entity))
-	   (let* ((name (elmo-string (, entity)))
-		  (folder (elmo-make-folder name)))
-	     (wl-folder-elmo-folder-cache-put name folder)
-	     folder)))))
-
 (defmacro wl-folder-elmo-folder-cache-get (name &optional hashtb)
   "Returns a elmo folder structure associated with NAME from HASHTB.
 Default HASHTB is `wl-folder-elmo-folder-hashtb'."
@@ -338,6 +329,16 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'."
   (` (elmo-set-hash-val (, name) (, folder)
 			(or (, hashtb) wl-folder-elmo-folder-hashtb))))
 
+(defmacro wl-folder-get-elmo-folder (entity &optional no-cache)
+  "Get elmo folder structure from entity."
+  (` (if (, no-cache)
+	 (elmo-make-folder (elmo-string (, entity)))
+       (or (wl-folder-elmo-folder-cache-get (, entity))
+	   (let* ((name (elmo-string (, entity)))
+		  (folder (elmo-make-folder name)))
+	     (wl-folder-elmo-folder-cache-put name folder)
+	     folder)))))
+
 (defun wl-folder-prev-entity ()
   (interactive)
   (forward-line -1))
@@ -477,7 +478,7 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'."
 	(wl-plugged t)
 	emptied)
     (if elmo-enable-disconnected-operation
-	(elmo-dop-queue-flush 'force)) ; Try flushing all queue.
+	(elmo-dop-queue-flush))
     (if (not (elmo-folder-list-messages
 	      (wl-folder-get-elmo-folder wl-queue-folder)))
 	(message "No sending queue exists.")
@@ -850,9 +851,7 @@ Optional argument ARG is repeart count."
 	      all    (and all    (max 0 all))))
       (setq unread (or (and unread (- unread (or new 0)))
 		       (elmo-folder-get-info-unread folder)
-		       (cdr (wl-summary-count-unread
-			     (elmo-msgdb-get-mark-alist
-			      (elmo-folder-msgdb folder))))))
+		       (cdr (wl-summary-count-unread))))
       (wl-folder-entity-hashtb-set wl-folder-entity-hashtb entity
 				   (list new unread all)
 				   (get-buffer wl-folder-buffer-name)))
@@ -2212,7 +2211,8 @@ Use `wl-subscribed-mailing-list'."
 ;;;	    (assoc fld-name wl-folder-group-alist))
     (setq fld-name wl-default-folder)
     (setq fld-name (or folder
-		       (wl-summary-read-folder fld-name)))
+		       (let (this-command)
+			 (wl-summary-read-folder fld-name))))
     (if (and (setq entity
 		   (wl-folder-search-entity-by-name fld-name
 						    wl-folder-entity
@@ -2502,6 +2502,7 @@ Use `wl-subscribed-mailing-list'."
 	(when (> len elmo-display-progress-threshold)
 	  (elmo-display-progress
 	   'wl-folder-open-all "Opening all folders..." 100))))
+    (wl-highlight-folder-path wl-folder-buffer-cur-path)
     (message "Opening all folders...done")
     (set-buffer-modified-p nil)))
 
@@ -2520,6 +2521,7 @@ Use `wl-subscribed-mailing-list'."
     (erase-buffer)
     (wl-folder-insert-entity " " wl-folder-entity)
     (wl-folder-move-path id)
+    (wl-highlight-folder-path wl-folder-buffer-cur-path)
     (recenter)
     (set-buffer-modified-p nil)))