From a581f55776252d18b4dd3ed81b3de54e8d3b8410 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Sun, 3 Aug 2003 03:02:35 +0000
Subject: [PATCH] * wl-summary.el (wl-summary-sync): Call
 wl-summary-sync-marks interactively. (wl-summary-sync):
 nokill->entirely. (wl-summary-sync-marks): Fixed message.
 (wl-summary-input-range): Added mark, nokill->entirely.

* wl-score.el (wl-summary-score-update-all-lines): Set expunged
messages as read.
---
 wl/ChangeLog     |   11 +++++++++++
 wl/wl-score.el   |    7 +++----
 wl/wl-summary.el |   11 ++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a4e6798..9cc733d 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2003-08-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-summary.el (wl-summary-sync): Call wl-summary-sync-marks
+	interactively.
+	(wl-summary-sync): nokill->entirely.
+	(wl-summary-sync-marks): Fixed message.
+	(wl-summary-input-range): Added mark, nokill->entirely.
+
+	* wl-score.el (wl-summary-score-update-all-lines): Set expunged
+	messages as read.
+
 2003-08-02  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-summary.el (wl-summary-input-range): Abolish all-noscore and
diff --git a/wl/wl-score.el b/wl/wl-score.el
index 03929f8..2035345 100644
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -1233,10 +1233,9 @@ Set `wl-score-cache' nil."
 	   'wl-summary-score-update-all-lines "Updating score..."
 	   (/ (* i 100) count))))
       (when dels
-	;;(let ((marks dels))
-	;;(while marks
-	;;(elmo-message-set-flag wl-summary-buffer-elmo-folder
-	;;				   (pop marks) 'read)))
+	(dolist (del dels)
+	  (elmo-message-set-flag wl-summary-buffer-elmo-folder
+				 del 'read))
 	(elmo-folder-kill-messages wl-summary-buffer-elmo-folder dels)
 	(wl-summary-delete-messages-on-buffer dels))
       (when (and update update-unread)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 3fe0489..80db851 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1168,7 +1168,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	     (and msg (wl-summary-jump-to-msg msg))))
 	  ((string= range "mark")
 	   (let ((msg (wl-summary-message-number)))
-	     (wl-summary-sync-marks)
+	     (call-interactively 'wl-summary-sync-marks)
 	     (and msg (wl-summary-jump-to-msg msg))))
 	  ((string= range "cache-status")
 	   (let ((msg (wl-summary-message-number)))
@@ -1182,7 +1182,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 					'force-update nil nil t))
 	  (t
 	   (wl-summary-sync-update unset-cursor
-				   (string-match "nokill" range)
+				   (string-match "entirely" range)
 				   (string-match "all" range))))))
 
 (defvar wl-summary-edit-addresses-candidate-fields
@@ -1692,7 +1692,7 @@ If ARG is non-nil, checking is omitted."
 	(wl-summary-mark-as-unanswered (car diffs) 'no-modeline)
 	(setq diffs (cdr diffs)))
       (setq diffs (car diff)) ; unread-appends
-      (setq mes (concat mes (format "/+%d) answered mark(s)." (length diffs))))
+      (setq mes (concat mes (format "/+%d) answered mark(s)," (length diffs))))
       (while diffs
 	(wl-summary-mark-as-answered (car diffs) 'no-modeline)
 	(setq diffs (cdr diffs)))
@@ -3312,12 +3312,13 @@ Return non-nil if the mark is updated"
 			    "first:"
 			    "last:"
 			    "cache-status"
+			    "mark"
 			    "rescan"
 			    "rescan-noscore"
 			    "update"
-			    "update-nokill"
+			    "update-entirely"
 			    "all"
-			    "all-nokill"))
+			    "all-entirely"))
 	(default (or (wl-get-assoc-list-value
 		      wl-folder-sync-range-alist
 		      folder)
-- 
1.7.10.4