From: teranisi <teranisi>
Date: Sun, 3 Apr 2005 06:16:23 +0000 (+0000)
Subject: Synch up with main trunk.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcbeaa15ca74193fd02c8abf29850c4547650272;p=elisp%2Fwanderlust.git

Synch up with main trunk.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 8741f07..3eda71a 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,19 @@
+2005-04-03  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-xmas.el (wl-folder-internal-icon-list): Fix last change.
+
+2005-03-27  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* wl-xmas.el (wl-folder-internal-icon-list): Added entry for
+	`Access folder'.
+
+2005-03-27  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-vars.el (wl-access-folder-icon): New user option.
+
+	* wl-e21.el (wl-folder-internal-icon-list): Added entry for
+	`Access folder'.
+
 2005-04-01  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* Version number is increased to 2.14.1.
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 152f059..d15e16f 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -441,6 +441,7 @@
     (wl-folder-nmz-image	  . wl-nmz-folder-icon)
     (wl-folder-shimbun-image      . wl-shimbun-folder-icon)
     (wl-folder-file-image	  . wl-file-folder-icon)
+    (wl-folder-access-image	  . wl-access-folder-icon)
     (wl-folder-trash-empty-image  . wl-empty-trash-folder-icon)
     (wl-folder-draft-image	  . wl-draft-folder-icon)
     (wl-folder-queue-image	  . wl-queue-folder-icon)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 824bbc1..d3bbc14 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -2973,6 +2973,8 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
   "*Icon file for file folder.")
 (defvar wl-maildir-folder-icon "maildir.xpm"
   "*Icon file for maildir folder.")
+(defvar wl-access-folder-icon "access.xpm"
+  "*Icon file for access folder.")
 (defvar wl-empty-trash-folder-icon "trash-e.xpm"
   "*Icon file for emptied trash folder.")
 (defvar wl-trash-folder-icon "trash.xpm"
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index f6eed1b..0453980 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -383,6 +383,7 @@
     (wl-folder-nmz-glyph	. wl-nmz-folder-icon)
     (wl-folder-shimbun-glyph	. wl-shimbun-folder-icon)
     (wl-folder-file-glyph	. wl-file-folder-icon)
+    (wl-folder-access-glyph	. wl-access-folder-icon)
     (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon)
     (wl-folder-draft-glyph	. wl-draft-folder-icon)
     (wl-folder-queue-glyph	. wl-queue-folder-icon)