From 4402017ef4d91a0a7290a8e4636f31427d1c7f01 Mon Sep 17 00:00:00 2001 From: yoichi Date: Mon, 9 Feb 2004 03:31:05 +0000 Subject: [PATCH] * elmo-util.el (elmo-buffer-field-primitive-condition-match): Use elmo-multiple-field-body instead of std11-field-body to check all headers. --- elmo/ChangeLog | 8 +++++++- elmo/elmo-util.el | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 97b9cc7..bcce1a8 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,9 @@ +2004-02-08 Yoichi NAKAYAMA + + * elmo-util.el (elmo-buffer-field-primitive-condition-match): Use + elmo-multiple-field-body instead of std11-field-body to check all + headers. + 2004-02-07 TAKAHASHI Kaoru * elmo-util.el (elmo-cache-expire): Completion require match "age" @@ -834,7 +840,7 @@ * elmo-util.el (elmo-msgdb-insert-file-header): Moved from modb-legacy.el. - (elmo-multiple-field-body): Moved from elmo-util.el. + (elmo-multiple-field-body): Moved from elmo-msgdb.el. * elmo-msgdb.el (elmo-multiple-field-body): Moved to elmo-util.el. diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index f07b296..cf169cb 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -864,11 +864,12 @@ the directory becomes empty after deletion." (setq result (search-forward (elmo-filter-value condition) nil t)))) (t - (let ((fval (std11-field-body (elmo-filter-key condition)))) + (dolist (fval (elmo-multiple-field-body (elmo-filter-key condition))) (if (eq (length fval) 0) (setq fval nil)) (if fval (setq fval (eword-decode-string fval))) - (setq result (and fval (string-match - (elmo-filter-value condition) fval)))))) + (setq result (or result + (and fval (string-match + (elmo-filter-value condition) fval))))))) (if (eq (elmo-filter-type condition) 'unmatch) (setq result (not result))) result)) -- 1.7.10.4