From: hmurata <hmurata>
Date: Tue, 31 Aug 2004 17:37:53 +0000 (+0000)
Subject: * wl-vars.el (wl-summary-mode-line-format-spec-alist): Follow the
X-Git-Tag: wl-2_11_31~26
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5923e5bfd9c02f0c41a48718c5c7e677b3e64f65;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-summary-mode-line-format-spec-alist): Follow the
change of return value of elmo-folder-count-flags.

* wl-summary.el (wl-summary-prefetch-msg): Ditto.
(wl-summary-mark-as-read-internal): Ditto.
(wl-summary-set-persistent-mark-internal): Ditto.
(wl-summary-folder-info-update): Ditto.
(wl-summary-sync-update): Fixed the last change.

* wl-score.el (wl-summary-score-update-all-lines): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 6ca727d..a4099eb 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-31  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-vars.el (wl-summary-mode-line-format-spec-alist): Follow the
+	change of return value of elmo-folder-count-flags.
+
+	* wl-summary.el (wl-summary-prefetch-msg): Ditto.
+	(wl-summary-mark-as-read-internal): Ditto.
+	(wl-summary-set-persistent-mark-internal): Ditto.
+	(wl-summary-folder-info-update): Ditto.
+	(wl-summary-sync-update): Fixed the last change.
+
+	* wl-score.el (wl-summary-score-update-all-lines): Ditto.
+
 2004-09-01  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (wl-draft-kill-pre-hook): New hook.
diff --git a/wl/wl-score.el b/wl/wl-score.el
index 3318177..68fcc56 100644
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -1219,11 +1219,8 @@ Set `wl-score-cache' nil."
 				       0
 				       (let ((flag-count
 					      (wl-summary-count-unread)))
-					 (+
-					  (or (cdr (assq 'new flag-count))
-					      0)
-					  (or (cdr (assq 'unread flag-count))
-					      0)))
+					 (or (cdr (assq 'unread flag-count))
+					     0))
 				       (elmo-folder-length
 					wl-summary-buffer-elmo-folder)))
 	(wl-summary-update-modeline))
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 910ced4..9f6f336 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1482,8 +1482,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)))))
 
@@ -1968,12 +1967,7 @@ This function is defined for `window-scroll-functions'"
       (wl-folder-set-folder-updated
        (elmo-folder-name-internal folder)
        (list 0
-	     (let ((flag-count (wl-summary-count-unread)))
-	       (+
-		(or (cdr (assq 'new flag-count))
-		    0)
-		(or (cdr (assq 'unread flag-count))
-		    0)))
+	     (or (cdr (assq 'unread (wl-summary-count-unread))) 0)
 	     (elmo-folder-length folder)))
       (wl-summary-update-modeline)
       ;;
@@ -3032,8 +3026,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-read (&optional number-or-numbers
 					  no-folder-mark
@@ -3086,8 +3079,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-unset-persistent-mark (&optional flag
 						   number-or-numbers
@@ -4753,8 +4745,7 @@ If ASK-CODING is non-nil, coding-system for the message is asked."
   (wl-folder-set-folder-updated
    (elmo-string (wl-summary-buffer-folder-name))
    (list 0
-	 (+ wl-summary-buffer-unread-count
-	    wl-summary-buffer-new-count)
+	 wl-summary-buffer-unread-count
 	 (elmo-folder-length
 	  wl-summary-buffer-elmo-folder))))
 
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index e24d8b6..6f117bc 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -202,8 +202,7 @@ If no match, `wl-summary-default-view' is used."
 	  (elmo-folder-name-internal wl-summary-buffer-elmo-folder)))
     (?t (if (eq wl-summary-buffer-view 'thread) "T" "S"))
     (?n wl-summary-buffer-new-count)
-    (?u (+ wl-summary-buffer-new-count
-	   wl-summary-buffer-unread-count))
+    (?u wl-summary-buffer-unread-count)
     (?a (length wl-summary-buffer-number-list)))
   "An alist of format specifications that can appear in summary mode-lines.
 Each element is a list of following: