From: yoichi <yoichi>
Date: Mon, 23 Jan 2006 14:10:46 +0000 (+0000)
Subject: * wl-vars.el (wl-message-buffer-prefetch-folder-type-list): Follow
X-Git-Tag: wl-2_15_3~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bbf2e80ca3754e9f64b5a3155f1c26cdc205b40c;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-message-buffer-prefetch-folder-type-list): Follow
the change of elmo-nmz -> elmo-search.
(wl-highlight-summary-line-help-echo-alist): Ditto.
(wl-search-folder-icon): Renamed from `wl-nmz-folder-icon'.
(wl-nmz-folder-icon): Define as obsolete.
* wl-e21.el (wl-folder-internal-icon-list): Follow it.
* wl-xmas.el (wl-folder-internal-icon-list): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 45949f2..7023bd4 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-23  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* wl-vars.el (wl-message-buffer-prefetch-folder-type-list): Follow
+	the change of elmo-nmz -> elmo-search.
+	(wl-highlight-summary-line-help-echo-alist): Ditto.
+	(wl-search-folder-icon): Renamed from `wl-nmz-folder-icon'.
+	(wl-nmz-folder-icon): Define as obsolete.
+	* wl-e21.el (wl-folder-internal-icon-list): Follow it.
+	* wl-xmas.el (wl-folder-internal-icon-list): Ditto.
+
 2006-01-22  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-summary.el (wl-summary-get-list-info): Rewrite with
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index e774304..45cd54e 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -446,7 +446,7 @@
     (wl-folder-archive-image      . wl-archive-folder-icon)
     (wl-folder-pipe-image	  . wl-pipe-folder-icon)
     (wl-folder-maildir-image      . wl-maildir-folder-icon)
-    (wl-folder-nmz-image	  . wl-nmz-folder-icon)
+    (wl-folder-search-image	  . wl-search-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)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index ccab50d..0757fd5 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -2267,7 +2267,7 @@ and reserved buffer cache."
 		      (const nntp)
 		      (const pop3)
 		      (const shimbun)
-		      (const nmz)
+		      (const search)
 		      (const archive)
 		      (const mark)
 		      (const cache)))
@@ -2850,7 +2850,7 @@ This variable can also be a regex."
 
 (defcustom wl-highlight-summary-line-help-echo-alist
   '((flag wl-highlight-flag-folder-help-echo)
-    (nmz elmo-message-file-name))
+    (search elmo-message-file-name))
   "*Alist to display help-echo in summary buffer.
 Each element is (folder-type handler(function)).
 Handler take two arguments elmo-folder and message number and return string."
@@ -2967,8 +2967,8 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
   "*Icon file for archive folder.")
 (defvar wl-pipe-folder-icon "pipe.xpm"
   "*Icon file for pipe folder.")
-(defvar wl-nmz-folder-icon "nmz.xpm"
-  "*Icon file for namazu folder.")
+(defvar wl-search-folder-icon "nmz.xpm"
+  "*Icon file for search folder.")
 (defvar wl-shimbun-folder-icon "shimbun.xpm"
   "*Icon file for shimbun folder.")
 (defvar wl-file-folder-icon "file.xpm"
@@ -3010,6 +3010,10 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 
 ;;;; Obsolete variables.
 
+;; 2005-01-23
+(elmo-define-obsolete-variable 'wl-nmz-folder-icon
+			       'wl-search-folder-icon)
+
 ;; 2003-11-05
 (elmo-define-obsolete-variable 'wl-summary-new-mark
 			       'wl-summary-new-uncached-mark)
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 55fe7d5..c130ea1 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -380,7 +380,7 @@
     (wl-folder-archive-glyph	. wl-archive-folder-icon)
     (wl-folder-pipe-glyph	. wl-pipe-folder-icon)
     (wl-folder-maildir-glyph	. wl-maildir-folder-icon)
-    (wl-folder-nmz-glyph	. wl-nmz-folder-icon)
+    (wl-folder-search-glyph	. wl-search-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)