From: teranisi <teranisi>
Date: Wed, 5 Nov 2003 13:26:24 +0000 (+0000)
Subject: 2003-11-05  Yuuichi Teranishi  <teranisi@gohome.org>
X-Git-Tag: wl-2_11_21~29
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8149304ba4c249b7c1f94e79c55105b82260c71e;p=elisp%2Fwanderlust.git

2003-11-05  Yuuichi Teranishi  <teranisi@gohome.org>

	    * modb-standard.el (elmo-msgdb-set-flag): Unset 'new flag when
	     read flag is set.
	     (elmo-msgdb-set-flag): Don't remove 'new flag unconditionally.
	     (elmo-msgdb-unset-flag): Ditto.

2003-11-05  Andreas Fuchs <asf@boinkor.net>

	    * elmo-split.el (elmo-split): Return split message count.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9644834..a352af9 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* modb-standard.el (elmo-msgdb-set-flag): Unset 'new flag when
+	read flag is set.
+	(elmo-msgdb-set-flag): Don't remove 'new flag unconditionally.
+	(elmo-msgdb-unset-flag): Ditto.
+
+2003-11-05  Andreas Fuchs <asf@boinkor.net>
+
+	* elmo-split.el (elmo-split): Return split message count.
+
 2003-11-05  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo-msgdb.el (elmo-flag-table-get): Check cached if saved flags
diff --git a/elmo/elmo-split.el b/elmo/elmo-split.el
index bb68ed9..70249b8 100644
--- a/elmo/elmo-split.el
+++ b/elmo/elmo-split.el
@@ -290,7 +290,8 @@ If prefix argument ARG is specified, do a reharsal (no harm)."
 	(format "%d messages are splitted" count)))
       (if (eq fcount 0)
 	  "."
-	(format " (%d failure)." fcount))))))
+	(format " (%d failure)." fcount))))
+    count))
 
 (defun elmo-split-subr (folder &optional reharsal)
   (let ((elmo-inhibit-display-retrieval-progress t)
diff --git a/elmo/modb-standard.el b/elmo/modb-standard.el
index 02ab400..a8e4d6a 100644
--- a/elmo/modb-standard.el
+++ b/elmo/modb-standard.el
@@ -291,6 +291,7 @@
 					 number flag)
   (case flag
     (read
+     (elmo-msgdb-unset-flag msgdb number 'new)
      (elmo-msgdb-unset-flag msgdb number 'unread))
     (uncached
      (elmo-msgdb-unset-flag msgdb number 'cached))
@@ -298,8 +299,6 @@
      (let* ((cur-flags (modb-standard-message-flags msgdb number))
 	    (new-flags (copy-sequence cur-flags))
 	    diff)
-       (and (memq 'new new-flags)
-	    (setq new-flags (delq 'new new-flags)))
        (or (memq flag new-flags)
 	   (setq new-flags (cons flag new-flags)))
        (when (and (eq flag 'unread)
@@ -331,8 +330,6 @@
      (let* ((cur-flags (modb-standard-message-flags msgdb number))
 	    (new-flags (copy-sequence cur-flags))
 	    diff)
-       (and (memq 'new new-flags)
-	    (setq new-flags (delq 'new new-flags)))
        (and (memq flag new-flags)
 	    (setq new-flags (delq flag new-flags)))
        (when (and (eq flag 'unread)