From c8707096074694be823c47d6c57078a063359c85 Mon Sep 17 00:00:00 2001 From: hmurata Date: Tue, 5 Jun 2001 07:22:58 +0000 Subject: [PATCH] * elmo-msgdb.el (elmo-msgdb-search-internal): Call itself instead of `elmo-msgdb-search-internal-primitive' when condition's car is `and' or `or'. --- elmo/ChangeLog | 6 ++++++ elmo/elmo-msgdb.el | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 3eb1174..7b0dfa5 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,9 @@ +2001-06-05 Hiroya Murata + + * elmo-msgdb.el (elmo-msgdb-search-internal): Call itself instead + of `elmo-msgdb-search-internal-primitive' when condition's car is + `and' or `or'. + 2001-05-23 Kenichi OKADA * elmo-nntp.el (elmo-nntp-get-newsgroup-by-msgid): Fix for luna. diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el index a9be278..7c76117 100644 --- a/elmo/elmo-msgdb.el +++ b/elmo/elmo-msgdb.el @@ -330,14 +330,14 @@ header separator." ((vectorp condition) (elmo-msgdb-search-internal-primitive condition entity number-list)) ((eq (car condition) 'and) - (and (elmo-msgdb-search-internal-primitive + (and (elmo-msgdb-search-internal (nth 1 condition) entity number-list) - (elmo-msgdb-search-internal-primitive + (elmo-msgdb-search-internal (nth 2 condition) entity number-list))) ((eq (car condition) 'or) - (or (elmo-msgdb-search-internal-primitive + (or (elmo-msgdb-search-internal (nth 1 condition) entity number-list) - (elmo-msgdb-search-internal-primitive + (elmo-msgdb-search-internal (nth 2 condition) entity number-list))))) (defun elmo-msgdb-delete-msgs (msgdb msgs) -- 1.7.10.4