From d91d94b140538eaf18f9f8c21c61d91b6e3831f5 Mon Sep 17 00:00:00 2001 From: hmurata Date: Sun, 22 May 2005 15:27:27 +0000 Subject: [PATCH] (elmo-nntp-use-server-search-p): New function. (elmo-folder-search): Use it. --- elmo/ChangeLog | 5 +++++ elmo/elmo-nntp.el | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 57adc5d..b725605 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2005-05-22 Hiroya Murata + + * elmo-nntp.el (elmo-nntp-use-server-search-p): New function. + (elmo-folder-search): Use it. + 2005-04-13 Hiroya Murata * modb-standard.el (modb-standard-loaded-message-id): Use diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el index 355e593..0b0abf4 100644 --- a/elmo/elmo-nntp.el +++ b/elmo/elmo-nntp.el @@ -1187,10 +1187,16 @@ Returns a list of cons cells like (NUMBER . VALUE)" from-msgs))) result (sort result '<)))))) +(defun elmo-nntp-use-server-search-p (condition) + (if (vectorp condition) + (not (string= "body" (elmo-filter-key condition))) + (and (elmo-nntp-use-server-search-p (nth 1 condition)) + (elmo-nntp-use-server-search-p (nth 2 condition))))) + (luna-define-method elmo-folder-search :around ((folder elmo-nntp-folder) condition &optional from-msgs) (if (and (elmo-folder-plugged-p folder) - (not (string= "body" (elmo-filter-key condition)))) + (elmo-nntp-use-server-search-p condition)) (elmo-nntp-search-internal folder condition from-msgs) (luna-call-next-method))) -- 1.7.10.4