w3m

commit 55c4f266b60367a17404813497e38fafc5adc91a
parent 6ccece4695a47f5318bd1513e06c4892630d30a2
Author: ukai <ukai>
Date:   Mon, 22 Mar 2004 03:32:27 +0000

* main.c (main): don't use SystemCharset for default of
	DisplayChaset, DocumentCharset
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
main.c
 | 
7
+++++--

2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 2004-03-22  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* main.c (main): don't use SystemCharset for default of
+		DisplayChaset, DocumentCharset
+
+2004-03-22  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* w3m 0.5
 	* version.c.in: update
 	* doc/README: version 0.5, release date, maintainer
diff --git a/main.c b/main.c
@@ -424,8 +424,11 @@ main(int argc, char **argv, char **envp)
 #ifdef USE_M17N
     if (non_null(Locale = getenv("LC_ALL")) ||
 	non_null(Locale = getenv("LC_CTYPE")) ||
-	non_null(Locale = getenv("LANG")))
-	DisplayCharset = DocumentCharset = SystemCharset = wc_guess_locale_charset(Locale, SystemCharset);
+	non_null(Locale = getenv("LANG"))) {
+	DisplayCharset = wc_guess_locale_charset(Locale, DisplayCharset);
+	DocumentCharset = wc_guess_locale_charset(Locale, DocumentCharset);
+	SystemCharset = wc_guess_locale_charset(Locale, SystemCharset);
+    }
 #ifdef __EMX__
     CodePage = wc_guess_charset(getCodePage(), 0);
     if (CodePage)