* elmo-multi.el (elmo-folder-search): Use nil for 1st argument of

elmo-list-filter.

* elmo-util.el (elmo-list-filter): Simplify.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 884cf87..cfef377 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,10 @@
 2003-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
 
+       * elmo-multi.el (elmo-folder-search): Use nil for 1st argument of
+       elmo-list-filter.
+
+       * elmo-util.el (elmo-list-filter): Simplify.
+
        * elmo.el (elmo-generic-folder-commit): Use elmo-folder-list-messages.
        (elmo-folder-set-info-max-by-numdb): Changed argument to number list.
        (elmo-generic-folder-diff): Abolish argument.

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 8d82fd0..a4c2313 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -372,10 +372,7 @@
     (while flds
       (setq cur-number (+ cur-number 1))
       (when numlist
-       (setq cur-numlist (car numlist-list))
-       (if (null cur-numlist)
-           ;; t means filter all.
-           (setq cur-numlist t)))
+       (setq cur-numlist (car numlist-list)))
       (setq ret-val (append
                     ret-val
                     (elmo-list-filter

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 413aaa9..d63c538 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -755,14 +755,8 @@ the directory becomes empty after deletion."
          ))))
 
 (defun elmo-list-filter (l1 l2)
-  "L1 is filter."
-  (if (eq l1 t)
-      ;; t means filter all.
-      nil
-    (if l1
-       (elmo-delete-if (lambda (x) (not (memq x l1))) l2)
-      ;; filter is nil
-      l2)))
+  "Rerurn a list from L2 in which each element is a member of L1."
+  (elmo-delete-if (lambda (x) (not (memq x l1))) l2))
 
 (defsubst elmo-list-delete-if-smaller (list number)
   (let ((ret-val (copy-sequence list)))