Synch up with main trunk.

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

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 3edc6ad..642834e 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1175,25 +1175,36 @@ FIELD is a symbol of the field."
                                                           &optional
                                                           section unread)
   (let ((cache-path (elmo-fetch-strategy-cache-path strategy))
-       err)
-    (or (and (eq (elmo-fetch-strategy-use-cache strategy) t)
-            (elmo-file-cache-load cache-path section))
-       (when (and (condition-case error
-                      (elmo-message-fetch-internal folder number
-                                                   strategy
-                                                   section
-                                                   unread)
-                    (error (setq err error) nil))
-                  (> (buffer-size) 0))
-         (elmo-delete-cr-buffer)
-         (when (and (elmo-fetch-strategy-save-cache strategy)
-                    cache-path)
-           (elmo-file-cache-save cache-path section))
-         t)
-       (and (eq (elmo-fetch-strategy-use-cache strategy) 'maybe)
-            (elmo-file-cache-load cache-path section))
-       (and err
-            (signal (car err) (cdr err))))))
+       (method-priorities
+        (cond ((eq (elmo-fetch-strategy-use-cache strategy) 'meybe)
+               '(entity cache))
+              ((elmo-fetch-strategy-use-cache strategy)
+               '(cache entity))
+              (t
+               '(entity))))
+       result err)
+    (while (and method-priorities
+               (null result))
+      (setq result
+           (case (car method-priorities)
+             (cache
+              (elmo-file-cache-load cache-path section))
+             (entity
+              (when (and (condition-case error
+                             (elmo-message-fetch-internal folder number
+                                                          strategy
+                                                          section
+                                                          unread)
+                           (error (setq err error) nil))
+                         (> (buffer-size) 0))
+                (elmo-delete-cr-buffer)
+                (when (and (elmo-fetch-strategy-save-cache strategy)
+                           cache-path)
+                  (elmo-file-cache-save cache-path section))
+                t)))
+           method-priorities (cdr method-priorities)))
+    (or result
+       (and err (signal (car err) (cdr err))))))
 
 (luna-define-method elmo-folder-clear ((folder elmo-folder)
                                       &optional keep-killed)
@@ -1267,16 +1278,7 @@ If update process is interrupted, return nil."
                              (length new-list)))
                     (setq diff-2 (elmo-list-diff (car diff) new-list)))
            (elmo-msgdb-append-to-killed-list folder (car diff-2)))
-         ;; Don't delete important marked messages.
-         (setq delete-list
-               (if (eq (elmo-folder-type-internal folder) 'mark)
-                   (cadr diff)
-                 (elmo-delete-if
-                  (lambda (x)
-                    (and (setq mark (cadr (assq x mark-alist)))
-                         (string= mark important-mark)))
-                  ;; delete message list
-                  (cadr diff))))
+         (setq delete-list (cadr diff))
          (if (or (equal diff '(nil nil))
                  (equal diff '(nil))
                  (and (eq (length (car diff)) 0)