* main.c (main): don't use SystemCharset for default of

DisplayChaset, DocumentCharset
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2004-03-22 03:32:27 +00:00
parent a3ce1b341c
commit 4f6a4c97ab
2 changed files with 12 additions and 4 deletions
+6 -1
View File
@@ -1,3 +1,8 @@
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
@@ -8336,4 +8341,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.909 2004/03/21 18:45:05 ukai Exp $
$Id: ChangeLog,v 1.910 2004/03/22 03:32:27 ukai Exp $
+6 -3
View File
@@ -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)