* wl-summary.el (wl-summary-pick): Use `elmo-folder-search'

instead of `elmo-msgdb-search'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 399102e..62acbdc 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
+       * wl-summary.el (wl-summary-pick): Use `elmo-folder-search'
+       instead of `elmo-msgdb-search'.
+
        * Version number is increased to 2.9.3.
 
 2002-01-05  OKAZAKI Tetsurou  <okazaki@be.to>

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 83b79cc..f83765b 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3670,10 +3670,12 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 
 (defun wl-summary-pick (&optional from-list delete-marks)
   (interactive)
-  (let ((result (elmo-msgdb-search
-                wl-summary-buffer-elmo-folder
-                (elmo-read-search-condition wl-summary-pick-field-default)
-                (wl-summary-buffer-msgdb))))
+  (let* ((condition (car (elmo-parse-search-condition
+                         (elmo-read-search-condition
+                          wl-summary-pick-field-default))))
+        (result (elmo-folder-search wl-summary-buffer-elmo-folder
+                                    condition
+                                    from-list)))
     (if delete-marks
       (let ((mlist wl-summary-buffer-target-mark-list))
        (while mlist
@@ -3681,12 +3683,11 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
            (wl-summary-unmark))
          (setq mlist (cdr mlist)))
        (setq wl-summary-buffer-target-mark-list nil)))
-    (if from-list
-       (setq result (elmo-list-filter from-list result)))
-    (message "%d message(s) are picked." (length result))
-    (if (null result)
-       (message "No message was picked.")
-      (wl-summary-target-mark-msgs result))))
+    (if result
+       (progn
+         (wl-summary-target-mark-msgs result)
+         (message "%d message(s) are picked." (length result)))
+      (message "No message was picked."))))
 
 (defun wl-summary-unvirtual ()
   "Exit from current virtual folder."