* main.c (main): DisplayCharset and DocumentCharset also follow

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

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c957955..38986af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-03-22  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* main.c (main): DisplayCharset and DocumentCharset also follow 
+	    locale configuration
+
+2004-03-22  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* libwc/Makefile.in: add distclean
 	* scripts/multipart/Makefile.in: add distclean
 	* scripts/w3mman/Makefile.in: add distclean
@@ -8325,4 +8330,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.904 2004/03/21 16:07:02 ukai Exp $
+$Id: ChangeLog,v 1.905 2004/03/21 16:37:08 ukai Exp $
diff --git a/main.c b/main.c
index e18a0c9..47f953c 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.237 2003/09/26 20:58:51 ukai Exp $ */
+/* $Id: main.c,v 1.238 2004/03/21 16:37:08 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -425,7 +425,7 @@ main(int argc, char **argv, char **envp)
     if (non_null(Locale = getenv("LC_ALL")) ||
 	non_null(Locale = getenv("LC_CTYPE")) ||
 	non_null(Locale = getenv("LANG")))
-	SystemCharset = wc_guess_locale_charset(Locale, SystemCharset);
+	DisplayCharset = DocumentCharset = SystemCharset = wc_guess_locale_charset(Locale, SystemCharset);
 #ifdef __EMX__
     CodePage = wc_guess_charset(getCodePage(), 0);
     if (CodePage)