From: hmurata <hmurata>
Date: Wed, 9 Jun 2004 05:45:36 +0000 (+0000)
Subject: * wl-summary.el (wl-summary-persistent-mark-string): Decide mark
X-Git-Tag: wl-2_11_30~10
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eec1a8edbd2876693ab4fd4798c7ad506da6c815;p=elisp%2Fwanderlust.git

* wl-summary.el (wl-summary-persistent-mark-string): Decide mark
according to 3rd element of wl-summary-flag-mark.

* wl-vars.el (wl-summary-flag-alist): Add description for mark.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index ec04efb..cac95bd 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-09  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-summary.el (wl-summary-persistent-mark-string): Decide mark
+	according to 3rd element of wl-summary-flag-mark.
+
+	* wl-vars.el (wl-summary-flag-alist): Add description for mark.
+
 2004-06-07  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-action.el (wl-summary-target-mark-all): Don't set
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 53de457..99ef6a8 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2850,7 +2850,15 @@ The mark is decided according to the FOLDER, FLAGS and CACHED."
     (while (and (null mark) priorities)
       (if (and (eq (car priorities) 'flag)
 	       (elmo-get-global-flags flags 'ignore-preserved))
-	  (setq mark wl-summary-flag-mark)
+	  (let ((specs wl-summary-flag-alist)
+		spec)
+	    (while (setq spec (car specs))
+	      (if (memq (car spec) flags)
+		  (setq mark (or (nth 2 spec) wl-summary-flag-mark)
+			specs nil)
+		(setq specs (cdr specs))))
+	    (unless mark
+	      (setq mark wl-summary-flag-mark)))
 	(when (memq (car priorities) flags)
 	  (setq mark
 		(or (case (car priorities)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index df6ac30..f7a1429 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -996,14 +996,16 @@ cdr of each cons cell is used for draft message."
   '((important "orange"))
   "An alist to define the flags for the summary mode.
 Each element is a form like:
-\(SYMBOL-OF-FLAG COLOR\)
+\(SYMBOL-OF-FLAG COLOR [MARK]\)
 Example:
 \((important \"orange\"\)
- \(todo \"red\"\)
- \(business \"green\"\)
+ \(todo \"red\" \"T\"\)
+ \(business \"green\" \"B\"\)
  \(private \"blue\"\)\)"
   :type '(repeat (list (symbol :tag "flag")
-		       (string :tag "color")))
+		       (string :tag "color")
+		       (choice (string :tag "mark")
+			       (const :tag "Default mark" nil))))
   :group 'wl-summary)
 
 (defcustom wl-summary-new-uncached-mark "N"