From: teranisi <teranisi>
Date: Mon, 6 Oct 2003 01:38:09 +0000 (+0000)
Subject: * elmo-filter.el (elmo-folder-search): Don't call elmo-list-filter
X-Git-Tag: wl-2_11_19~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dfcff619bf8c1d510cce824afda5a93ae491edd7;p=elisp%2Fwanderlust.git

* elmo-filter.el (elmo-folder-search): Don't call elmo-list-filter
if numbers is nil.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 8060c94..4dfdecf 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-filter.el (elmo-folder-search): Don't call elmo-list-filter
+	if numbers is nil.
+
 2003-10-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* elmo-util.el (toplevel): Require emu for char-list-to-string.
diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index c0a0817..75461ca 100644
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -243,11 +243,13 @@
 (luna-define-method elmo-folder-search ((folder elmo-filter-folder)
 					condition &optional numbers)
   ;; search from messages in this folder
-  (elmo-list-filter
-   numbers
-   (elmo-folder-search (elmo-filter-folder-target-internal folder)
-		       condition
-		       (elmo-folder-list-messages folder))))
+  (let ((result (elmo-folder-search
+		 (elmo-filter-folder-target-internal folder)
+		 condition
+		 (elmo-folder-list-messages folder))))
+    (if numbers
+	(elmo-list-filter numbers result)
+      result)))
 
 (luna-define-method elmo-message-use-cache-p ((folder elmo-filter-folder)
 					      number)