* elmo-imap4.el (elmo-imap4-session-select-mailbox): Added argument `no-error'.

[elisp/wanderlust.git] / elmo / elmo-maildir.el

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 9d0d3b5..19663aa 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -52,7 +52,7 @@ This variable should not be used in elsewhere.")
   (expand-file-name
    (let ((file (file-name-completion (symbol-name location)
                                     (expand-file-name "cur" dir))))
-     (if (eq file t) location file))
+     (if (eq file t) (symbol-name location) file))
    (expand-file-name "cur" dir)))
 
 (defsubst elmo-maildir-list-location (dir &optional child-dir)
@@ -114,23 +114,26 @@ This variable should not be used in elsewhere.")
     ;; cleanup tmp directory.
     (elmo-maildir-cleanup-temporal maildir)
     ;; move new msgs to cur directory.
-    (mapcar (lambda (x)
-             (rename-file
-              (expand-file-name x (expand-file-name "new" maildir))
-              (expand-file-name (concat x ":2,")
-                                (expand-file-name "cur" maildir))))
-           news)))
+    (while news
+      (rename-file
+       (expand-file-name (car news) (expand-file-name "new" maildir))
+       (expand-file-name (concat (car news) ":2,")
+                        (expand-file-name "cur" maildir)))
+      (setq news (cdr news)))))
 
 (defun elmo-maildir-set-mark (filename mark)
   "Mark the file in the maildir. MARK is a character."
-  (if (string-match "^\\([^:]+:2,\\)\\(.*\\)$" filename)
+  (if (string-match "^\\([^:]+:[12],\\)\\(.*\\)$" filename)
       (let ((flaglist (string-to-char-list (elmo-match-string
                                            2 filename))))
        (unless (memq mark flaglist)
          (setq flaglist (sort (cons mark flaglist) '<))
          (rename-file filename
                       (concat (elmo-match-string 1 filename)
-                              (char-list-to-string flaglist)))))))
+                              (char-list-to-string flaglist)))))
+    ;; Rescue no info file in maildir.
+    (rename-file filename
+                (concat filename ":2," (char-to-string mark)))))
 
 (defun elmo-maildir-delete-mark (filename mark)
   "Mark the file in the maildir. MARK is a character."
@@ -229,7 +232,7 @@ This variable should not be used in elsewhere.")
           'elmo-maildir-msgdb-create "Creating msgdb..."
           percent))
        (setq numlist (cdr numlist)))
-      (message "Creating msgdb...done.")
+      (message "Creating msgdb...done")
       (elmo-msgdb-sort-by-date
        (list overview number-alist mark-alist loc-alist)))))
 
@@ -360,7 +363,8 @@ file name for maildir directories."
        (cons (+ (or (elmo-max-of-list flist) 0) (length news))
              (+ (length news)
                 (if killed
-                    (- (length flist) (length killed))
+                    (- (length flist)
+                       (elmo-msgdb-killed-list-length killed))
                   (length flist))))
       (setq numbers (sort flist '<))
       (elmo-living-messages numbers killed))))