From cd74b2c36de6b94445e524bc9abdfdf0cb1af5f8 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Fri, 29 Sep 2000 02:28:27 +0000
Subject: [PATCH] * wl.el (wl-toggle-plugged): Set
 `wl-biff-check-folders-running' as nil.

* wl-summary.el (wl-summary-sync-force-update): Save seen-list only
when it is persistent.
(wl-summary-sync-marks): Changed argument for
`elmo-list-folder-unread' and `elmo-list-folder-important'.
(wl-summary-virtual): Use `elmo-read-search-condition'.
(wl-summary-redisplay-internal): If folder is local, mark as read
even when folder is plugged.
---
 wl/ChangeLog     |   13 +++++++++++++
 wl/wl-summary.el |   42 +++++++++++++++++++-----------------------
 wl/wl.el         |    1 +
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index e291620..82a19dc 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,16 @@
+2000-09-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl.el (wl-toggle-plugged): Set `wl-biff-check-folders-running' as
+	nil.
+
+	* wl-summary.el (wl-summary-sync-force-update): Save seen-list only
+	when it is persistent.
+	(wl-summary-sync-marks): Changed argument for
+	`elmo-list-folder-unread' and `elmo-list-folder-important'.
+	(wl-summary-virtual): Use `elmo-read-search-condition'.
+	(wl-summary-redisplay-internal): If folder is local, mark as read
+	even when folder is plugged.
+
 2000-09-28  Katsumi Yamaoka    <yamaoka@jpl.org>
 
 	* wl-e21.el (wl-e21-make-toolbar-buttons): Don't modify the value
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 6035fb0..88fa6c6 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1145,9 +1145,11 @@ q	Goto folder mode.
 	ret-val seen-list)
     (unwind-protect
 	(progn
-	  (setq seen-list (elmo-msgdb-seen-load msgdb-dir))
+	  (if wl-summary-buffer-persistent
+	      (setq seen-list (elmo-msgdb-seen-load msgdb-dir)))
 	  (setq ret-val (wl-summary-sync-update3 seen-list unset-cursor))
-	  (elmo-msgdb-seen-save msgdb-dir nil))
+	  (if wl-summary-buffer-persistent
+	      (elmo-msgdb-seen-save msgdb-dir nil)))
       (set-buffer (current-buffer)))
     (if (interactive-p)
 	(message "%s" ret-val))
@@ -2062,13 +2064,13 @@ If optional argument is non-nil, checking is omitted."
             num-ma (length mark-alist)
 	    importants (elmo-list-folder-important
 			wl-summary-buffer-folder-name
-			(elmo-msgdb-get-overview wl-summary-buffer-msgdb))
+			wl-summary-buffer-msgdb)
 	    has-imap4 (elmo-folder-contains-type
 		       wl-summary-buffer-folder-name 'imap4)
 	    unreads (if (and has-imap4 plugged)
 			(elmo-list-folder-unread
 			 wl-summary-buffer-folder-name
-			 mark-alist unread-marks)))
+			 wl-summary-buffer-msgdb unread-marks)))
       (while mark-alist
 	(if (string= (cadr (car mark-alist))
 		     wl-summary-important-mark)
@@ -3963,22 +3965,12 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
   (interactive "P")
   (if arg
       (wl-summary-unvirtual)
-    (let* ((completion-ignore-case t)
-	   (field (completing-read (format "Field name (%s): "
-					   wl-summary-pick-field-default)
-				   '(("From" . "From")
-				     ("Subject" . "Subject")
-				     ("To" . "To")
-				     ("Cc" . "Cc")
-				     ("Body" . "Body")
-				     ("Since" . "Since")
-				     ("Before" . "Before"))))
-	   (value (read-from-minibuffer "Value: ")))
-      (if (string= field "")
-	  (setq field wl-summary-pick-field-default))
-      (wl-summary-goto-folder-subr (concat "/" (downcase field) "=" value "/"
-					   wl-summary-buffer-folder-name)
-				   'update nil nil t))))
+    (wl-summary-goto-folder-subr (concat "/"
+					 (elmo-read-search-condition
+					  wl-summary-pick-field-default)
+					 "/"
+					 wl-summary-buffer-folder-name)
+				 'update nil nil t)))
 
 (defun wl-summary-delete-all-temp-marks ()
   (interactive)
@@ -5480,10 +5472,14 @@ Reply to author if invoked with argument."
 				       (if wl-message-cache-used
 					   nil
 					 ;; plugged, then leave server-mark.
-					 (if (elmo-folder-plugged-p
-					      wl-summary-buffer-folder-name)
+					 (if (and
+					      (not
+					       (elmo-folder-local-p
+						wl-summary-buffer-folder-name))
+					      (elmo-folder-plugged-p
+					       wl-summary-buffer-folder-name))
 					     'leave))
-				       t) ;; displayed
+				       t) ; displayed
 	    )
 	  (setq wl-summary-buffer-current-msg num)
 	  (when wl-summary-recenter
diff --git a/wl/wl.el b/wl/wl.el
index 56124a9..a546c65 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -107,6 +107,7 @@
 	;; msgdb is saved, but cache is not saved yet.
 	(wl-summary-set-message-modified)))
      (wl-collect-summary)))
+  (setq wl-biff-check-folders-running nil)
   (if wl-plugged
       (progn
 	;; flush queue!!
-- 
1.7.10.4