From ff929f8ec4316bd688325371f3d1a8dcefb08654 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Sat, 2 Aug 2003 16:05:30 +0000
Subject: [PATCH] * elmo.el (elmo-folder-list-message-entities): Ignore
 killed-list.

* wl-summary.el (wl-summary-sync): Rearrange rescan.
(wl-summary-input-range): Added rescan-nokill.
---
 elmo/ChangeLog   |    4 ++++
 elmo/elmo.el     |    2 +-
 wl/ChangeLog     |    5 +++++
 wl/wl-summary.el |   15 ++++++++-------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6492931..a3d977d 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo.el (elmo-folder-list-message-entities): Ignore killed-list.
+
 2003-08-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo.el (elmo-msgdb-load): Use elmo-msgdb-list-messages.
diff --git a/elmo/elmo.el b/elmo/elmo.el
index b800a05..a67eda7 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1171,7 +1171,7 @@ ENTITY is the message-entity to get the parent.")
   ;; List all message entities in the FOLDER.
   (mapcar
    (lambda (number) (elmo-message-entity folder number))
-   (elmo-folder-list-messages folder t t)))
+   (elmo-folder-list-messages folder nil t))) ; XXX killed-list is not used.
 
 (defmacro elmo-folder-do-each-message-entity (spec &rest form)
   "Iterator for message entity in the folder.
diff --git a/wl/ChangeLog b/wl/ChangeLog
index ba6c632..7804273 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-summary.el (wl-summary-sync): Rearrange rescan.
+	(wl-summary-input-range): Added rescan-nokill.
+
 2003-08-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-action.el (wl-summary-target-mark-all): Use
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index a02ff5a..a281f9b 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1158,14 +1158,14 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	 (msgdb-dir (elmo-folder-msgdb-path folder))
 	 (range (or force-range (wl-summary-input-range
 				 (elmo-folder-name-internal folder)))))
-    (cond ((string= range "rescan")
-	   (let ((msg (wl-summary-message-number)))
-	     (wl-summary-rescan)
-	     (and msg (wl-summary-jump-to-msg msg))))
-	  ((string= range "rescan-noscore")
+    (cond ((string-match "rescan" range)
 	   (let ((msg (wl-summary-message-number))
-		 wl-use-scoring)
-	     (wl-summary-rescan nil t)
+		 (wl-use-scoring (if (string-match "noscore" range)
+				     nil
+				   wl-use-scoring)))
+	     (wl-summary-rescan nil
+				(or (string-match "nokill" range)
+				    (string-match "noscore" range)))
 	     (and msg (wl-summary-jump-to-msg msg))))
 	  ((string= range "mark")
 	   (let ((msg (wl-summary-message-number)))
@@ -3318,6 +3318,7 @@ Return non-nil if the mark is updated"
 			    "last:"
 			    "cache-status"
 			    "rescan"
+n			    "rescan-nokill"
 			    "rescan-noscore"
 			    "update"
 			    "update-nokill"
-- 
1.7.10.4