From: yoichi <yoichi>
Date: Mon, 19 Jun 2006 13:46:08 +0000 (+0000)
Subject: * wl-util.el (wl-search-condition-fields): Remove "AND","OR".
X-Git-Tag: wl-2_15_4~26
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afc8db6babffb58505c697ffd459de1597e9a57d;p=elisp%2Fwanderlust.git

* wl-util.el (wl-search-condition-fields): Remove "AND","OR".
(wl-read-search-condition-internal): Append them.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3d4fed3..6aa1ffd 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-19  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* wl-util.el (wl-search-condition-fields): Remove "AND","OR".
+	(wl-read-search-condition-internal): Append them.
+
 2006-06-19  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-vars.el (wl-additional-search-condition-fields):
diff --git a/wl/wl-util.el b/wl/wl-util.el
index e81fe2a..eef7ee1 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -1040,7 +1040,7 @@ is enclosed by at least one regexp grouping construct."
 		'("Flag" "Since" "Before"
 		  "From" "Subject" "To" "Cc" "Body" "ToCc"
 		  "Larger" "Smaller"))))
-    (append '("AND" "OR" "Last" "First")
+    (append '("Last" "First")
 	    denial-fields
 	    (mapcar (lambda (f) (concat "!" f))
 		    denial-fields))))
@@ -1053,7 +1053,8 @@ is enclosed by at least one regexp grouping construct."
   (let* ((completion-ignore-case t)
 	 (field (completing-read
 		 (format "%s (%s): " prompt default)
-		 (mapcar #'list (wl-search-condition-fields))))
+		 (mapcar #'list
+			 (append '("AND" "OR") (wl-search-condition-fields)))))
 	 value)
     (setq field (if (string= field "")
 		    (setq field default)