From: kaoru <kaoru>
Date: Mon, 10 Dec 2001 06:00:46 +0000 (+0000)
Subject: * wl-folder.el (wl-folder-check-one-entity): Fixed car of return
X-Git-Tag: wl-2_8-root~79
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=936eaca7f61beae0d43ecb9e69a571d1aea0ed49;p=elisp%2Fwanderlust.git

* wl-folder.el (wl-folder-check-one-entity): Fixed car of return
value.  Refactoring `wl-folder-notify-deleted' is nil case.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7dd76a3..8d97daf 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* wl-folder.el (wl-folder-check-one-entity): Fixed car of return
+	value.  Refactoring `wl-folder-notify-deleted' is nil case.
+
 2001-12-08  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (wl-summary-update-confirm-threshold): Abolished.
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 188bd68..8d07931 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -816,8 +816,12 @@ Optional argument ARG is repeart count."
 	  (wl-folder-sync-entity entity)
 	  (setq nums (elmo-folder-diff folder)))
       (unless wl-folder-notify-deleted
-	(setq unsync (if (and (car nums) (> 0 (car nums))) 0 (car nums)))
-	(setq nomif (if (and (car nums) (> 0 (cdr nums))) 0 (cdr nums)))
+	(setq unsync (if (car nums)
+			 (max 0 (car nums))
+		       nil))
+	(setq nomif (if (cdr nums)
+			(max 0 (cdr nums))
+		      nil))
 	(setq nums (cons unsync nomif)))
       (setq unread (or ;; If server diff, All unreads are
 			; treated as unsync.
@@ -837,8 +841,10 @@ Optional argument ARG is repeart count."
     (setq wl-folder-info-alist-modified t)
     (sit-for 0)
     (list (if wl-folder-notify-deleted
-	      (car nums)
-	    (or new (max (or (car nums) 0)))) unread (cdr nums))))
+	      (or new (car nums))
+	    (max 0 (or new (car nums))))
+	  unread
+	  (cdr nums))))
 
 (defun wl-folder-check-entity-async (entity &optional auto)
   (let ((elmo-nntp-groups-async t)