X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-util.el;h=e5d23fe4851448299c4bfce508fb06161a03f775;hb=b5edc99b23521b790554f61def0aa0354745db06;hp=f07b296153e359720ec64572082dda6c87af7926;hpb=b7b2b1558307ba282be6ae2f3c2698742ceff380;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index f07b296..e5d23fe 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -355,9 +355,6 @@ Return value is a cons cell of (STRUCTURE . REST)"
 	  (nconc list rest))
       (nconc list (list element)))))
 
-(defun elmo-string-partial-p (string)
-  (and (stringp string) (string-match "message/partial" string)))
-
 (defun elmo-get-file-string (filename &optional remove-final-newline)
   (elmo-set-work-buf
    (let (insert-file-contents-pre-hook   ; To avoid autoconv-xmas...
@@ -864,11 +861,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))
@@ -1301,7 +1299,7 @@ But if optional argument AUTO is non-nil, DEFAULT is returned."
 	  (throw 'found t))
       (setq slist (cdr slist)))))
 
-(cond ((fboundp 'member-ignore-case)
+(static-cond ((fboundp 'member-ignore-case)
        (defalias 'elmo-string-member-ignore-case 'member-ignore-case))
       ((fboundp 'compare-strings)
        (defun elmo-string-member-ignore-case (elt list)