* wl-vars.el (wl-folder-sync-range-alist): Set default range for

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

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 201c670..bf00c65 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -696,32 +696,27 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
       (elmo-pop3-sort-msgdb-by-original-number
        folder
        (elmo-pop3-msgdb-create-by-header
+       folder
        process
        numlist
        flag-table
        (if (elmo-pop3-folder-use-uidl-internal folder)
            (elmo-pop3-folder-location-alist-internal folder)))))))
 
-(defun elmo-pop3-sort-overview-by-original-number (overview loc-alist)
-  (if loc-alist
-      (sort overview
-           (lambda (ent1 ent2)
-             (< (elmo-pop3-uidl-to-number
-                 (cdr (assq (elmo-msgdb-overview-entity-get-number ent1)
-                            loc-alist)))
-                (elmo-pop3-uidl-to-number
-                 (cdr (assq (elmo-msgdb-overview-entity-get-number ent2)
-                            loc-alist))))))
-    overview))
-
 (defun elmo-pop3-sort-msgdb-by-original-number (folder msgdb)
-  (message "Sorting...")
-  (let ((overview (elmo-msgdb-get-overview msgdb)))
-    (setq overview (elmo-pop3-sort-overview-by-original-number
-                   overview
-                   (elmo-pop3-folder-location-alist-internal folder)))
-    (message "Sorting...done")
-    (list overview (nth 1 msgdb)(nth 2 msgdb)(nth 3 msgdb))))
+  (let ((location-alist (elmo-pop3-folder-location-alist-internal folder)))
+    (when location-alist
+      (elmo-msgdb-sort-entities
+       msgdb
+       (lambda (ent1 ent2 loc-alist)
+        (< (elmo-pop3-uidl-to-number
+            (cdr (assq (elmo-msgdb-overview-entity-get-number ent1)
+                       loc-alist)))
+           (elmo-pop3-uidl-to-number
+            (cdr (assq (elmo-msgdb-overview-entity-get-number ent2)
+                       loc-alist)))))
+       location-alist))
+    msgdb))
 
 (defun elmo-pop3-uidl-to-number (uidl)
   (string-to-number (elmo-get-hash-val uidl
@@ -735,9 +730,9 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
   (elmo-get-hash-val (format "#%d" number)
                     elmo-pop3-size-hash))
 
-(defun elmo-pop3-msgdb-create-by-header (process numlist
-                                                flag-table
-                                                loc-alist)
+(defun elmo-pop3-msgdb-create-by-header (folder process numlist
+                                               flag-table
+                                               loc-alist)
   (let ((tmp-buffer (get-buffer-create " *ELMO Overview TMP*")))
     (with-current-buffer (process-buffer process)
       (if loc-alist ; use uidl.
@@ -752,6 +747,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
                                  tmp-buffer process numlist)
       (prog1
          (elmo-pop3-msgdb-create-message
+          folder
           tmp-buffer
           process
           (length numlist)
@@ -759,15 +755,16 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
           flag-table loc-alist)
        (kill-buffer tmp-buffer)))))
 
-(defun elmo-pop3-msgdb-create-message (buffer
+(defun elmo-pop3-msgdb-create-message (folder
+                                      buffer
                                       process
                                       num
                                       numlist
                                       flag-table
                                       loc-alist)
   (save-excursion
-    (let (beg overview number-alist mark-alist
-             entity i number message-id gmark seen size)
+    (let ((new-msgdb (elmo-make-msgdb))
+         beg entity i number message-id flags)
       (set-buffer buffer)
       (elmo-set-buffer-multibyte default-enable-multibyte-characters)
       (goto-char (point-min))
@@ -785,9 +782,6 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
                   (car numlist)))
            (setq numlist (cdr numlist))
            (when entity
-             (setq overview
-                   (elmo-msgdb-append-element
-                    overview entity))
              (with-current-buffer (process-buffer process)
                (elmo-msgdb-overview-entity-set-size
                 entity
@@ -801,30 +795,17 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
                             (elmo-msgdb-overview-entity-get-number entity))
                            loc-alist)))
                    (elmo-msgdb-overview-entity-set-number entity number)))
-             (setq number-alist
-                   (elmo-msgdb-number-add
-                    number-alist
-                    (elmo-msgdb-overview-entity-get-number entity)
-                    (car entity)))
-             (setq message-id (car entity))
-             (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
-                                 (elmo-msgdb-mark
-                                  (elmo-flag-table-get flag-table message-id)
-                                  (elmo-file-cache-status
-                                   (elmo-file-cache-get message-id))
-                                  'new)))
-                 (setq mark-alist
-                       (elmo-msgdb-mark-append
-                        mark-alist
-                        (elmo-msgdb-overview-entity-get-number entity)
-                        gmark))))))
+             (setq message-id (elmo-message-entity-field entity 'message-id)
+                   flags (elmo-flag-table-get flag-table message-id))
+             (elmo-global-flags-set flags folder number message-id)
+             (elmo-msgdb-append-entity new-msgdb entity flags))))
        (when (> num elmo-display-progress-threshold)
          (setq i (1+ i))
          (if (or (zerop (% i 5)) (= i num))
              (elmo-display-progress
               'elmo-pop3-msgdb-create-message "Creating msgdb..."
               (/ (* i 100) num)))))
-      (list overview number-alist mark-alist))))
+      new-msgdb)))
 
 (defun elmo-pop3-read-body (process outbuf)
   (with-current-buffer (process-buffer process)
@@ -914,13 +895,13 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
              (error "Deleting message failed")))
        (error "Deleting message failed")))))
 
-(luna-define-method elmo-folder-delete-messages-plugged
-  ((folder elmo-pop3-folder) msgs)
+(luna-define-method elmo-folder-delete-messages-plugged ((folder
+                                                         elmo-pop3-folder)
+                                                        msgs)
   (let ((loc-alist (elmo-pop3-folder-location-alist-internal folder))
        (process (elmo-network-session-process-internal
                  (elmo-pop3-get-session folder))))
-    (mapcar '(lambda (msg) (elmo-pop3-delete-msg
-                           process msg loc-alist))
+    (mapcar '(lambda (msg) (elmo-pop3-delete-msg process msg loc-alist))
            msgs)))
 
 (luna-define-method elmo-message-use-cache-p ((folder elmo-pop3-folder) number)