X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=fe6239e891da90ad991f68b831ac6bdcb3c3ed09;hb=0e5efb8f0af32ab5f97c97256c464c80b59a7269;hp=e7f2566e02895ed391ee47eebfd8fc6c30f75117;hpb=bd1c7daca8de303dd5766cb7831e964cfe3a03c5;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index e7f2566..fe6239e 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -55,11 +55,9 @@ folder) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder)) - (elmo-flatten - (mapcar - 'elmo-folder-get-primitive-list - (list (elmo-pipe-folder-src-internal folder) - (elmo-pipe-folder-dst-internal folder))))) + (nconc + (elmo-folder-get-primitive-list (elmo-pipe-folder-src-internal folder)) + (elmo-folder-get-primitive-list (elmo-pipe-folder-dst-internal folder)))) (luna-define-method elmo-folder-contains-type ((folder elmo-pipe-folder) type) @@ -100,12 +98,14 @@ (unwind-protect (progn (elmo-folder-set-killed-list-internal src ignore-list) - (elmo-folder-list-messages src)) + (elmo-folder-list-messages src t)) (elmo-folder-set-killed-list-internal src nil))) (defun elmo-pipe-drain (src dst &optional copy ignore-list) "Move or copy all messages of SRC to DST." - (let ((elmo-inhibit-number-mapping (not copy)) ; No need to use UIDL + (let ((elmo-inhibit-number-mapping (and (eq (elmo-folder-type-internal + src) 'pop3) + (not copy))) ; No need to use UIDL msgs len) (message "Checking %s..." (elmo-folder-name-internal src)) ;; Warnnig: some function requires msgdb @@ -120,8 +120,7 @@ "Copying messages..." "Moving messages..."))) (unwind-protect - (elmo-folder-move-messages src msgs dst - nil nil copy) + (elmo-folder-move-messages src msgs dst copy) (elmo-progress-clear 'elmo-folder-move-messages)) (when (and copy msgs) (setq ignore-list (elmo-number-set-append-list ignore-list @@ -186,7 +185,8 @@ ((consp (cdr dst-diff)) ; new unread all (mapcar (lambda (number) (+ number src-length)) dst-diff)) (t - (cons (+ (car dst-diff) src-length) (cdr dst-diff)))) + (cons (+ (car dst-diff) src-length) + (+ (cdr dst-diff) src-length)))) ;; No save. (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder)) (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder))))) @@ -268,38 +268,40 @@ (elmo-folder-message-make-temp-files (elmo-pipe-folder-dst-internal folder) numbers start-number)) -(luna-define-method elmo-folder-mark-as-read ((folder elmo-pipe-folder) - numbers &optional ignore-flag) - (elmo-folder-mark-as-read (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) +(luna-define-method elmo-folder-flag-as-read ((folder elmo-pipe-folder) + numbers &optional is-local) + (elmo-folder-flag-as-read (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-read ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-unflag-read ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-unmark-read (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-unflag-read (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-important ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-unflag-important ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-unmark-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-unflag-important (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-mark-as-important ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-flag-as-important ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-flag-as-important (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-answered ((folder elmo-pipe-folder) - numbers) - (elmo-folder-unmark-answered (elmo-pipe-folder-dst-internal folder) - numbers)) +(luna-define-method elmo-folder-unflag-answered ((folder elmo-pipe-folder) + numbers + &optional is-local) + (elmo-folder-unflag-answered (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-mark-as-answered ((folder elmo-pipe-folder) - numbers) - (elmo-folder-mark-as-answered (elmo-pipe-folder-dst-internal folder) - numbers)) +(luna-define-method elmo-folder-flag-as-answered ((folder elmo-pipe-folder) + numbers + &optional is-local) + (elmo-folder-flag-as-answered (elmo-pipe-folder-dst-internal folder) + numbers is-local)) (luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder)) (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder))) @@ -326,12 +328,10 @@ (elmo-pipe-folder-dst-internal new-folder)) (elmo-msgdb-rename-path folder new-folder))) -(luna-define-method elmo-folder-commit ((folder elmo-pipe-folder)) - (elmo-folder-commit - (elmo-pipe-folder-dst-internal folder))) - (luna-define-method elmo-folder-synchronize ((folder elmo-pipe-folder) - &optional ignore-msgdb + &optional + disable-killed + ignore-msgdb no-check) (let ((src-folder (elmo-pipe-folder-src-internal folder)) (dst-folder (elmo-pipe-folder-dst-internal folder))) @@ -346,7 +346,8 @@ (elmo-pipe-folder-copied-list-load folder))) (elmo-pipe-drain src-folder dst-folder)))) (elmo-folder-synchronize - (elmo-pipe-folder-dst-internal folder) ignore-msgdb no-check)) + (elmo-pipe-folder-dst-internal folder) + disable-killed ignore-msgdb no-check)) (luna-define-method elmo-folder-list-flagged ((folder elmo-pipe-folder) flag @@ -363,8 +364,8 @@ (luna-define-method elmo-folder-count-flags ((folder elmo-pipe-folder)) (elmo-folder-count-flags (elmo-pipe-folder-dst-internal folder))) -(luna-define-method elmo-message-mark ((folder elmo-pipe-folder) number) - (elmo-message-mark (elmo-pipe-folder-dst-internal folder) number)) +(luna-define-method elmo-message-flags ((folder elmo-pipe-folder) number) + (elmo-message-flags (elmo-pipe-folder-dst-internal folder) number)) (luna-define-method elmo-message-field ((folder elmo-pipe-folder) number field)