From: okazaki <okazaki>
Date: Wed, 19 Nov 2003 14:47:38 +0000 (+0000)
Subject: Back out rev. 1.304 and 1.305.  (See [Wanderlust 12525])
X-Git-Tag: wl-2_11_22~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2d84c9802c01d75327ec105a7af0f8f50a63d9f6;p=elisp%2Fwanderlust.git

Back out rev. 1.304 and 1.305.  (See [Wanderlust 12525])

* wl-summary.el (wl-summary-prefetch-msg): Undo the last change.
(wl-summary-mark-as-read-all): Ditto.
(wl-summary-delete-messages-on-buffer): Ditto.
(wl-summary-sync-update): Ditto.
(wl-summary-mark-as-read-internal): Ditto.
(wl-summary-mark-as-answered-internal): Ditto.
(wl-summary-update-folder-info): Abolished.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1eaac6f..e0be364 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-19  Tetsurou Okazaki  <okazaki@be.to>
+
+	* wl-summary.el (wl-summary-prefetch-msg): Undo the last change.
+	(wl-summary-mark-as-read-all): Ditto.
+	(wl-summary-delete-messages-on-buffer): Ditto.
+	(wl-summary-sync-update): Ditto.
+	(wl-summary-mark-as-read-internal): Ditto.
+	(wl-summary-mark-as-answered-internal): Ditto.
+	(wl-summary-update-folder-info): Abolished.
+
 2003-11-19  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-summary.el (wl-summary-mark-as-read-all): Use
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index bf6ae15..f89ff08 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1416,7 +1416,8 @@ 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-unread-count
+		      wl-summary-buffer-new-count))))
 	      t)
 	  nil)))))
 
@@ -1588,9 +1589,9 @@ If ARG is non-nil, checking is omitted."
 	  (while (not (eobp))
 	    (wl-summary-update-persistent-mark)
 	    (forward-line 1)))
+	(wl-folder-update-unread (wl-summary-buffer-folder-name) 0)
 	(setq wl-summary-buffer-unread-count 0)
 	(setq wl-summary-buffer-new-count    0)
-	(wl-summary-update-folder-info)
 	(wl-summary-update-modeline)
 	(message "Setting all msgs as read...done"))))
 
@@ -1667,7 +1668,7 @@ If ARG is non-nil, checking is omitted."
       ;;(message (concat deleting-info "done"))
       (wl-summary-count-unread)
       (wl-summary-update-modeline)
-      (wl-summary-update-folder-info))))
+      (wl-summary-folder-info-update))))
 
 (defun wl-summary-update-status-marks (beg end &optional check)
   "Synchronize status marks on current buffer to the msgdb."
@@ -1921,9 +1922,13 @@ This function is defined for `window-scroll-functions'"
 		  (format "%d crosspost message(s)" crossed)))
 	(and mes (setq mes (concat mes "."))))
       ;; Update Folder mode
-      (wl-summary-count-unread)
+      (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-update-modeline)
-      (wl-summary-update-folder-info)
       ;;
       (unless unset-cursor
 	(goto-char (point-min))
@@ -2950,7 +2955,10 @@ 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-summary-update-folder-info))))))
+	  (wl-folder-update-unread
+	   (wl-summary-buffer-folder-name)
+	   (+ wl-summary-buffer-unread-count
+	      wl-summary-buffer-new-count)))))))
 
 (defun wl-summary-mark-as-read (&optional number-or-numbers
 					  no-folder-mark
@@ -3001,7 +3009,8 @@ 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-unread-count
+	      wl-summary-buffer-new-count)))))))
 
 (defun wl-summary-mark-as-answered (&optional number-or-numbers
 					      no-modeline-update)
@@ -4520,14 +4529,6 @@ 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))