* main.c (main): DisplayCharset also follow locale

From: Fumitoshi UKAI  <ukai@debian.or.jp>

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 212842a..68307f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-23  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* main.c (main): DisplayCharset also follow locale
+
+2004-03-23  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* scripts/w3mhelp.cgi.in: use charset parramter
 	* scripts/w3mhelp-funcdesc.en.pl.in: add charset
 	* scripts/w3mhelp-funcdesc.ja.pl.in: ditto
@@ -8347,4 +8351,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.911 2004/03/22 17:03:13 ukai Exp $
+$Id: ChangeLog,v 1.912 2004/03/22 17:12:33 ukai Exp $
diff --git a/main.c b/main.c
index 09144ee..530ec9f 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.239 2004/03/22 03:32:27 ukai Exp $ */
+/* $Id: main.c,v 1.240 2004/03/22 17:12:33 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -446,8 +446,10 @@ main(int argc, char **argv, char **envp)
     URLHist = newHist();
 
 #ifdef USE_M17N
-    if (FollowLocale && Locale)
+    if (FollowLocale && Locale) {
+	DisplayCharset = wc_guess_locale_charset(Locale, DisplayCharset);
 	SystemCharset = wc_guess_locale_charset(Locale, SystemCharset);
+    }
     auto_detect = WcOption.auto_detect;
 #endif