From f28225e3ae99f99be034192d6607df003b905d26 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Wed, 29 Sep 2004 14:54:44 +0000
Subject: [PATCH] * elmo.el (elmo-message-flags): Don't return `read'.

* wl-summary.el (wl-summary-overview-entity-compare-by-from):
Don't extract mail address.
(wl-summary-mark-as-read-all): Dont' treat `read' flag.

* wl-draft.el (wl-draft-do-fcc): Don't treat `read' flag.

* wl-score.el (wl-summary-score-update-all-lines): Ditto.
---
 elmo/ChangeLog   |    1 +
 elmo/elmo.el     |    3 +--
 wl/ChangeLog     |   10 ++++++++++
 wl/wl-draft.el   |    2 +-
 wl/wl-score.el   |    4 ++--
 wl/wl-summary.el |   14 ++++++--------
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c7deacd..ed16e37 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -2,6 +2,7 @@
 
 	* elmo.el (elmo-folder-append-buffer): Fix docstring.
 	(elmo-folder-append-msgdb): Don't treat `read'.
+	(elmo-message-flags): Don't return `read'.
 
 	* elmo-dop.el (elmo-folder-set-read-delayed): Don't treat `read'.
 	(elmo-folder-unset-read-delayed): Ditto.
diff --git a/elmo/elmo.el b/elmo/elmo.el
index b30c930..d9fe670 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -475,8 +475,7 @@ the message with NUMBER checks whether it has MSGID.")
       (let ((this-id (elmo-message-field folder number 'message-id)))
 	(and this-id
 	     (string= this-id msgid)
-	     (or (elmo-msgdb-flags (elmo-folder-msgdb folder) number)
-		 '(read))))
+	     (elmo-msgdb-flags (elmo-folder-msgdb folder) number)))
     (elmo-msgdb-flags (elmo-folder-msgdb folder) number)))
 
 (defsubst elmo-message-flagged-p (folder number flag)
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 4b4aca2..1df6aa5 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-summary.el (wl-summary-overview-entity-compare-by-from): 
+	Don't extract mail address.
+	(wl-summary-mark-as-read-all): Dont' treat `read' flag.
+
+	* wl-draft.el (wl-draft-do-fcc): Don't treat `read' flag.
+
+	* wl-score.el (wl-summary-score-update-all-lines): Ditto.
+
 2004-09-28  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-fldmgr.el (wl-fldmgr-exit): Display length of
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 4c26bc3..4088e63 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1602,7 +1602,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	  (if (elmo-folder-append-buffer
 	       (wl-folder-get-elmo-folder
 		(eword-decode-string (car fcc-list)))
-	       (and wl-fcc-force-as-read '(read)))
+	       (or wl-fcc-force-as-read '(unread)))
 	      (wl-draft-write-sendlog 'ok 'fcc nil (car fcc-list) id)
 	    (wl-draft-write-sendlog 'failed 'fcc nil (car fcc-list) id))
 	  (if (and wl-draft-fcc-append-read-folder-history
diff --git a/wl/wl-score.el b/wl/wl-score.el
index aed453f..f17e36b 100644
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -1208,8 +1208,8 @@ Set `wl-score-cache' nil."
 	   (/ (* i 100) count))))
       (when dels
 	(dolist (del dels)
-	  (elmo-message-set-flag wl-summary-buffer-elmo-folder
-				 del 'read))
+	  (elmo-message-unset-flag wl-summary-buffer-elmo-folder
+				   del 'unread))
 	(elmo-folder-kill-messages wl-summary-buffer-elmo-folder dels)
 	(wl-summary-delete-messages-on-buffer dels))
       (when (and update update-unread)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 2aebd02..bea2754 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -885,12 +885,10 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 (defun wl-summary-overview-entity-compare-by-from (x y)
   "Compare entity X and Y by from."
   (string<
-   (wl-address-header-extract-address
-    (or (elmo-message-entity-field x 'from t)
-	wl-summary-no-from-message))
-   (wl-address-header-extract-address
-    (or (elmo-message-entity-field y 'from t)
-	wl-summary-no-from-message))))
+   (or (elmo-message-entity-field x 'from t)
+       wl-summary-no-from-message)
+   (or (elmo-message-entity-field y 'from t)
+       wl-summary-no-from-message)))
 
 (defun wl-summary-overview-entity-compare-by-subject (x y)
   "Compare entity X and Y by subject."
@@ -1658,10 +1656,10 @@ If ARG is non-nil, checking is omitted."
       (let ((folder wl-summary-buffer-elmo-folder)
 	    (cur-buf (current-buffer)))
 	(message "Setting all msgs as read...")
-	(elmo-folder-set-flag
+	(elmo-folder-unset-flag
 	 folder
 	 (elmo-folder-list-flagged folder 'unread 'in-msgdb)
-	 'read)
+	 'unread)
 	(save-excursion
 	  (goto-char (point-min))
 	  (while (not (eobp))
-- 
1.7.10.4