aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2004-03-22 03:32:27 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2004-03-22 03:32:27 +0000
commit4f6a4c97ab3255b74814fa75bbc277c4e405cbe4 (patch)
tree5be333df6bbb666ee9d28131b240b57b2c09808d /main.c
parentrevert the change (diff)
downloadw3m-4f6a4c97ab3255b74814fa75bbc277c4e405cbe4.tar.gz
w3m-4f6a4c97ab3255b74814fa75bbc277c4e405cbe4.zip
* main.c (main): don't use SystemCharset for default of
DisplayChaset, DocumentCharset From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to 'main.c')
-rw-r--r--main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/main.c b/main.c
index 47f953c..09144ee 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.238 2004/03/21 16:37:08 ukai Exp $ */
+/* $Id: main.c,v 1.239 2004/03/22 03:32:27 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -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)