(elmo-flatten): Use `append' and `listp' instead of

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

diff --git a/elmo/elmo-sendlog.el b/elmo/elmo-sendlog.el
index a9f0f60..ce01c2b 100644 (file)
--- a/elmo/elmo-sendlog.el
+++ b/elmo/elmo-sendlog.el
@@ -59,17 +59,17 @@
        result)
     (if (not (file-readable-p filename))
        nil
-      (elmo-set-work-buf
-       (as-binary-input-file
-       (insert-file-contents filename))
-       (goto-char (point-min))
-       (catch 'done
-        (while t
-          (re-search-forward "id=\\([^@]+@[^@]+\\)$" (point-at-eol) t)
-          (setq result (append result (list (match-string 1))))
-          (if (eq (1+ (point-at-eol)) (point-max))
-              (throw 'done nil)
-            (beginning-of-line 2))))))
+      (with-temp-buffer
+       (as-binary-input-file
+        (insert-file-contents filename))
+       (goto-char (point-min))
+       (catch 'done
+         (while t
+           (re-search-forward "id=\\([^@]+@[^@]+\\)$" (point-at-eol) t)
+           (setq result (append result (list (match-string 1))))
+           (if (eq (1+ (point-at-eol)) (point-max))
+               (throw 'done nil)
+             (beginning-of-line 2))))))
     result))
 
 (luna-define-method elmo-folder-message-file-p ((folder elmo-sendlog-folder))
@@ -90,7 +90,7 @@
     (while numbers
       (setq entity
            (elmo-msgdb-create-message-entity-from-file
-            new-msgdb (car numbers)
+            (elmo-msgdb-message-entity-handler new-msgdb) (car numbers)
             (elmo-message-file-name folder (car numbers))))
       (if (null entity)
          (elmo-folder-set-killed-list-internal
@@ -111,10 +111,15 @@
     (message "Creating msgdb...done")
     new-msgdb))
 
-(luna-define-method elmo-message-fetch-with-cache-process
-  ((folder elmo-sendlog-folder) number strategy &optional section unseen)
+(luna-define-method elmo-message-fetch
+  ((folder elmo-sendlog-folder) number strategy &optional unseen section)
   ;; disbable cache process
-  (elmo-message-fetch-internal folder number strategy section unseen))
+  (erase-buffer)
+  (when (elmo-message-fetch-internal folder number strategy section unseen)
+    (when (and (not unseen)
+              (elmo-message-flagged-p folder number 'unread))
+      (elmo-message-unset-flag folder number 'unread))
+    t))
 
 (luna-define-method elmo-map-message-fetch ((folder elmo-sendlog-folder)
                                            location strategy
@@ -129,16 +134,15 @@
 
 (luna-define-method elmo-folder-delete-messages ((folder elmo-sendlog-folder)
                                                 numbers)
-  (let ((killed-list (elmo-folder-killed-list-internal folder)))
-    (dolist (number numbers)
-      (setq killed-list
-           (elmo-msgdb-set-as-killed killed-list number)))
-    (elmo-folder-set-killed-list-internal folder killed-list))
+  (elmo-folder-kill-messages folder numbers)
   t)
 
 (luna-define-method elmo-message-file-p ((folder elmo-sendlog-folder) number)
   t)
 
+(luna-define-method elmo-folder-have-subfolder-p ((folder elmo-sendlog-folder))
+  nil)
+
 (require 'product)
 (product-provide (provide 'elmo-sendlog) (require 'elmo-version))