From a798b27762b51c03e90d9f88ae9de02a090bb649 Mon Sep 17 00:00:00 2001
From: okazaki <okazaki>
Date: Tue, 18 Nov 2003 14:28:02 +0000
Subject: [PATCH] * wl-summary.el (wl-summary-update-folder-info): New
 function derived from `wl-summary-folder-info-update'.
 (wl-summary-delete-messages-on-buffer): Use
 `wl-summary-update-folder-info' instead of
 `wl-summary-folder-info-update'. (wl-summary-sync-update):
 Use `wl-summary-update-folder-info' instead of
 `wl-folder-set-folder-updated'.
 (wl-summary-mark-as-read-internal): Use
 `wl-summary-update-folder-info' instead of
 `wl-folder-update-unread'.
 (wl-summary-mark-as-answered-internal,
 wl-summary-prefetch-msg): Pass the value of
 `wl-summary-buffer-unread-count' for the second parameter
 of `wl-folder-update-unread'.

---
 wl/wl-summary.el |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index f89ff08..1f739c0 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1416,8 +1416,7 @@ If ARG is non-nil, checking is omitted."
 		  (wl-summary-update-modeline)
 		  (wl-folder-update-unread
 		   (wl-summary-buffer-folder-name)
-		   (+ wl-summary-buffer-unread-count
-		      wl-summary-buffer-new-count))))
+		   wl-summary-buffer-unread-count)))
 	      t)
 	  nil)))))
 
@@ -1668,7 +1667,7 @@ If ARG is non-nil, checking is omitted."
       ;;(message (concat deleting-info "done"))
       (wl-summary-count-unread)
       (wl-summary-update-modeline)
-      (wl-summary-folder-info-update))))
+      (wl-summary-update-folder-info))))
 
 (defun wl-summary-update-status-marks (beg end &optional check)
   "Synchronize status marks on current buffer to the msgdb."
@@ -1922,13 +1921,9 @@ This function is defined for `window-scroll-functions'"
 		  (format "%d crosspost message(s)" crossed)))
 	(and mes (setq mes (concat mes "."))))
       ;; Update Folder mode
-      (wl-folder-set-folder-updated
-       (elmo-folder-name-internal folder)
-       (list 0
-	     (let ((lst (wl-summary-count-unread)))
-	       (+ (car lst) (nth 1 lst)))
-	     (elmo-folder-length folder)))
+      (wl-summary-count-unread)
       (wl-summary-update-modeline)
+      (wl-summary-update-folder-info)
       ;;
       (unless unset-cursor
 	(goto-char (point-min))
@@ -2955,10 +2950,7 @@ Return non-nil if the mark is updated"
 	  ;; should elmo-folder-flag-as-read return unread numbers?
 	  (wl-summary-count-unread)
 	  (wl-summary-update-modeline)
-	  (wl-folder-update-unread
-	   (wl-summary-buffer-folder-name)
-	   (+ wl-summary-buffer-unread-count
-	      wl-summary-buffer-new-count)))))))
+	  (wl-summary-update-folder-info))))))
 
 (defun wl-summary-mark-as-read (&optional number-or-numbers
 					  no-folder-mark
@@ -3009,8 +3001,7 @@ Return non-nil if the mark is updated"
 	  (wl-summary-update-modeline)
 	  (wl-folder-update-unread
 	   (wl-summary-buffer-folder-name)
-	   (+ wl-summary-buffer-unread-count
-	      wl-summary-buffer-new-count)))))))
+	   wl-summary-buffer-unread-count))))))
 
 (defun wl-summary-mark-as-answered (&optional number-or-numbers
 					      no-modeline-update)
@@ -4529,6 +4520,14 @@ If ASK-CODING is non-nil, coding-system for the message is asked."
 	  (wl-summary-print-message)
 	  (wl-summary-unmark))))))
 
+(defun wl-summary-update-folder-info ()
+  (wl-folder-set-folder-updated
+   (elmo-string (wl-summary-buffer-folder-name))
+   (list wl-summary-buffer-new-count
+	 wl-summary-buffer-unread-count
+	 (elmo-folder-length
+	  wl-summary-buffer-elmo-folder))))
+
 (defun wl-summary-folder-info-update ()
   (wl-folder-set-folder-updated
    (elmo-string (wl-summary-buffer-folder-name))
-- 
1.7.10.4