From 9ca2f7d749079d1f65245ac550fef3e778ec5e31 Mon Sep 17 00:00:00 2001 From: hmurata Date: Thu, 13 Jan 2005 08:24:34 +0000 Subject: [PATCH] * elmo-util.el (elmo-condition-parse-primitive): Downcase search-key. * elmo-shimbun.el (shimbun-mua-search-id): Use `elmo-message-entity' instead of `elmo-msgdb-message-entity'. (elmo-shimbun-folder-shimbun-header): Ditto. (elmo-shimbun-get-headers): Ditto. (elmo-shimbun-update-overview): Ditto. * elmo-pipe.el (elmo-folder-detach-messages): Define. * elmo-net.el (elmo-folder-list-messages-unplugged): Use `elmo-folder-list-messages' instead of `elmo-msgdb-list-messages'. --- elmo/ChangeLog | 16 ++++++++++++++++ elmo/elmo-net.el | 2 +- elmo/elmo-pipe.el | 5 +++++ elmo/elmo-shimbun.el | 15 ++++----------- elmo/elmo-util.el | 2 +- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index e89dd9c..d776bfc 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,19 @@ +2005-01-13 Hiroya Murata + + * elmo-util.el (elmo-condition-parse-primitive): Downcase + search-key. + + * elmo-shimbun.el (shimbun-mua-search-id): Use + `elmo-message-entity' instead of `elmo-msgdb-message-entity'. + (elmo-shimbun-folder-shimbun-header): Ditto. + (elmo-shimbun-get-headers): Ditto. + (elmo-shimbun-update-overview): Ditto. + + * elmo-pipe.el (elmo-folder-detach-messages): Define. + + * elmo-net.el (elmo-folder-list-messages-unplugged): Use + `elmo-folder-list-messages' instead of `elmo-msgdb-list-messages'. + 2005-01-13 Yuuichi Teranishi * elmo.el (elmo-message-fetch): Unset unread flag on server when diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el index ece84d8..02782b3 100644 --- a/elmo/elmo-net.el +++ b/elmo/elmo-net.el @@ -417,7 +417,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." (elmo-delete-if (lambda (number) (memq number deleting)) ;; current number-list. - (elmo-msgdb-list-messages (elmo-folder-msgdb folder))) + (elmo-folder-list-messages folder nil 'in-msgdb)) ;; append appending messages (mapcar (lambda (x) (* -1 x)) (elmo-dop-spool-folder-list-messages folder)))) diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index c9dc006..a62eaf6 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -95,6 +95,11 @@ (elmo-folder-delete-messages (elmo-pipe-folder-dst-internal folder) numbers)) +(luna-define-method elmo-folder-detach-messages ((folder elmo-pipe-folder) + numbers) + (elmo-folder-detach-messages (elmo-pipe-folder-dst-internal folder) + numbers)) + (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.") (defsubst elmo-pipe-folder-list-target-messages (src &optional ignore-list) diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el index 0fb3f24..bffd8f2 100644 --- a/elmo/elmo-shimbun.el +++ b/elmo/elmo-shimbun.el @@ -94,9 +94,7 @@ If it is the symbol `all', update overview for all shimbun folders." (luna-define-internal-accessors 'shimbun-elmo-mua)) (luna-define-method shimbun-mua-search-id ((mua shimbun-elmo-mua) id) - (elmo-msgdb-message-entity (elmo-folder-msgdb - (shimbun-elmo-mua-folder-internal mua)) - id)) + (elmo-message-entity (shimbun-elmo-mua-folder-internal mua) id)) (eval-and-compile (luna-define-class elmo-shimbun-folder @@ -121,9 +119,7 @@ If it is the symbol `all', update overview for all shimbun folders." (defsubst elmo-shimbun-folder-shimbun-header (folder location) (let ((hash (elmo-shimbun-folder-header-hash-internal folder))) (or (and hash (elmo-get-hash-val location hash)) - (let ((entity (elmo-msgdb-message-entity - (elmo-folder-msgdb folder) - location)) + (let ((entity (elmo-message-entity folder location)) (elmo-hash-minimum-size 63) header) (when entity @@ -200,9 +196,7 @@ If it is the symbol `all', update overview for all shimbun folders." (delq nil (mapcar (lambda (x) - (unless (elmo-msgdb-message-entity - (elmo-folder-msgdb folder) - (shimbun-header-id x)) + (unless (elmo-message-entity folder (shimbun-header-id x)) x)) ;; This takes much time. (shimbun-headers @@ -380,8 +374,7 @@ If it is the symbol `all', update overview for all shimbun folders." nil) (defsubst elmo-shimbun-update-overview (folder shimbun-id header) - (let ((entity (elmo-msgdb-message-entity (elmo-folder-msgdb folder) - shimbun-id)) + (let ((entity (elmo-message-entity folder shimbun-id)) (message-id (shimbun-header-id header)) references) (unless (string= shimbun-id message-id) diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index fb9d44f..95ace75 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -247,7 +247,7 @@ Return value is a cons cell of (STRUCTURE . REST)" (goto-char (match-end 0)) (let ((search-key (vector (if (match-beginning 1) 'unmatch 'match) - (elmo-match-buffer 2) + (downcase (elmo-match-buffer 2)) (elmo-condition-parse-search-value)))) ;; syntax sugar. (if (string= (aref search-key 1) "tocc") -- 1.7.10.4