Merge from trunk:

2002-12-21  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>

	* wl-vars.el (wl-summary-weekday-name-lang): Set default value
	according to current-language-environment.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 98a996d..1f1d953 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -29,6 +29,11 @@
        * wl-e21.el (toplevel): Do not set wl-folder-mode-map.
        (avoid error for the case without byte-compiling)
 
+2002-12-21  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-vars.el (wl-summary-weekday-name-lang): Set default value
+       according to current-language-environment.
+
 2002-12-11  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * 2.10.0 is released.

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 6d7fe5c..b37442d 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1359,7 +1359,11 @@ Allowed situations are:
   :type '(repeat (cons (string :tag "Realname") (string :tag "Petname")))
   :group 'wl-folder)
 
-(defcustom wl-summary-weekday-name-lang "ja"
+(defcustom wl-summary-weekday-name-lang
+  (if (and (boundp 'current-language-environment)
+          (string-equal "Japanese"
+                        (symbol-value 'current-language-environment)))
+      "ja" "en")
   "*Language to display week day."
   :type '(choice (const "ja")
                 (const "en")