From: yoichi <yoichi>
Date: Mon, 14 Mar 2005 13:21:54 +0000 (+0000)
Subject: * elmo-flag.el (elmo-global-flags-initialize): Don't include
X-Git-Tag: wl-2_15_3~117
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=770239977c3660397a304a31f14055017a8b54f0;p=elisp%2Fwanderlust.git

* elmo-flag.el (elmo-global-flags-initialize): Don't include
member of elmo-local-flags.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d28fdba..a2f7e52 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-14  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* elmo-flag.el (elmo-global-flags-initialize): Don't include
+	member of elmo-local-flags.
+
 2005-03-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-version.el (elmo-version): Up to 2.15.0.
diff --git a/elmo/elmo-flag.el b/elmo/elmo-flag.el
index cb2ebdc..826cd7d 100644
--- a/elmo/elmo-flag.el
+++ b/elmo/elmo-flag.el
@@ -444,12 +444,14 @@ If optional IGNORE-PRESERVED is non-nil, preserved flags
 (defun elmo-global-flags-initialize (&optional additional-flags)
   (let ((dir (expand-file-name "flag" elmo-msgdb-directory)))
     (setq elmo-global-flags
-	  (elmo-uniq-list
-	   (append
-	    elmo-global-flags
-	    additional-flags
-	    (mapcar 'intern
-		    (delete ".." (delete "." (directory-files dir)))))))))
+	  (elmo-list-delete
+	   elmo-local-flags
+	   (elmo-uniq-list
+	    (append
+	     elmo-global-flags
+	     additional-flags
+	     (mapcar 'intern
+		     (delete ".." (delete "." (directory-files dir))))))))))
 
 ;;; To migrate from global mark folder
 (defvar elmo-global-mark-filename "global-mark"