From c645ee02a91a2bdabe7e91fc334fcdc8c317406e Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Sat, 4 Sep 2004 04:36:19 +0000
Subject: [PATCH] * wl-vars.el (wl-summary-persistent-mark-priority-list):
 Update docstring and custom spec.

* wl-summary.el (wl-summary-unset-persistent-mark): Treat global
flags too; Don't treat Cached and New.
(wl-summary-set-persistent-mark): Ditto.

* wl-folder.el (wl-folder-set-persistent-mark): Renamed from
`wl-folder-set-flag'.

* wl-draft.el (wl-draft-send): Use `wl-folder-set-persistent-mark'
instead of `wl-folder-set-flag'.
---
 wl/ChangeLog     |   13 +++++++++++++
 wl/wl-draft.el   |    3 ++-
 wl/wl-folder.el  |    4 ++--
 wl/wl-summary.el |   14 ++++++++++++--
 wl/wl-vars.el    |   11 +++++------
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 171432c..a34ff8c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,18 @@
 2004-09-04  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-vars.el (wl-summary-persistent-mark-priority-list): Update
+	docstring and custom spec.
+
+	* wl-summary.el (wl-summary-unset-persistent-mark): Treat global
+	flags too; Don't treat Cached and New.
+	(wl-summary-set-persistent-mark): Ditto.
+
+	* wl-folder.el (wl-folder-set-persistent-mark): Renamed from
+	`wl-folder-set-flag'.
+
+	* wl-draft.el (wl-draft-send): Use `wl-folder-set-persistent-mark'
+	instead of `wl-folder-set-flag'.
+
 	* wl-summary.el (wl-summary-unset-persistent-mark): Ignore case
 	for completion.
 	(wl-summary-set-persistent-mark): Ditto.
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 45fe622..a4a182f 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1364,7 +1364,8 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	    ;; might changed by Fcc.
 	    ;; It causes a huge loss in the IMAP folder.
 	    (when (and parent-flag parent-number parent-folder)
-	      (wl-folder-set-flag parent-folder parent-number parent-flag))
+	      (wl-folder-set-persistent-mark
+	       parent-folder parent-number parent-flag))
 	    (funcall wl-draft-send-function editing-buffer kill-when-done)
 	    ;; Now perform actions on successful sending.
 	    (while mail-send-actions
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index fe5a84f..9a497bf 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -505,8 +505,8 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'."
 	    (wl-folder-toggle-disp-summary 'off wl-queue-folder)
 	  (switch-to-buffer cur-buf))))))
 
-(defun wl-folder-set-flag (folder number flag)
-  "Set FLAG on the message."
+(defun wl-folder-set-persistent-mark (folder number flag)
+  "Set a persistent mark which corresponds to the specified flag on message."
   (let ((buffer (wl-summary-get-buffer folder))
 	elmo-folder)
     (if buffer
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 6543a7f..6d299b3 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3094,7 +3094,12 @@ Return non-nil if the mark is updated"
 			   "Flag: "
 			   (mapcar (lambda (flag)
 				     (list (capitalize (symbol-name flag))))
-				   elmo-preserved-flags)
+				   (delq
+				    'cached
+				    (delq 'new
+					  (elmo-uniq-list
+					   (append elmo-global-flag-list
+						   elmo-preserved-flags)))))
 			   nil
 			   'require-match))))))
   (wl-summary-set-persistent-mark-internal 'inverse
@@ -3114,7 +3119,12 @@ Return non-nil if the mark is updated"
 			   "Flag: "
 			   (mapcar (lambda (flag)
 				     (list (capitalize (symbol-name flag))))
-				   elmo-preserved-flags)
+				    (delq
+				     'cached
+				     (delq 'new
+					   (elmo-uniq-list
+					    (append elmo-global-flag-list
+						    elmo-preserved-flags)))))
 			   nil
 			   'require-match))))))
   (wl-summary-set-persistent-mark-internal
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index ddbeb91..83e7bcc 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1020,16 +1020,15 @@ cdr of each cons cell is used for preparing headers of draft message."
 						      new
 						      answered
 						      unread)
-  "List of flags reflected with the priority to persistent marks and faces."
-  :type '(repeat (radio (const :format "%v " new)
-			(const :format "%v " flag)
-			(const :format "%v " answered)
-			(const :format "%v " unread)))
+  "List of preserved flag symbols to define the priority to map\
+to the persistent mark.
+Special symbol `flag' means the user defined flag."
+  :type '(repeat (symbol :tag "preserved flag"))
   :group 'wl-summary)
 
 (defcustom wl-summary-flag-alist
   '((important "orange"))
-  "An alist to define the flags for the summary mode.
+  "An alist to define the global flags for the summary mode.
 Each element is a form like:
 \(SYMBOL-OF-FLAG COLOR [MARK]\)
 Example:
-- 
1.7.10.4