aboutsummaryrefslogtreecommitdiffstats
path: root/rc.c
diff options
context:
space:
mode:
authorDai Sato <satodai@w3m.jp>2007-05-23 12:34:20 +0000
committerDai Sato <satodai@w3m.jp>2007-05-23 12:34:20 +0000
commite4305ca608b6dd74732cb877298d74319a4ecba7 (patch)
treedae2e685496b7d3d8d6b6e3e6392db3d5657e470 /rc.c
parent[w3m-dev 03923] avoid extra blanks in pre in table. (diff)
downloadw3m-e4305ca608b6dd74732cb877298d74319a4ecba7.tar.gz
w3m-e4305ca608b6dd74732cb877298d74319a4ecba7.zip
[w3m-dev 04240] nl_langinfo() requires setlocale()
Diffstat (limited to '')
-rw-r--r--rc.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/rc.c b/rc.c
index 352ba60..dfb6797 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.103 2006/12/10 11:01:24 inu Exp $ */
+/* $Id: rc.c,v 1.104 2007/05/23 12:34:20 inu Exp $ */
/*
* Initialization file etc.
*/
@@ -790,9 +790,11 @@ show_params(FILE * fp)
char *t = NULL;
char *cmt;
-#if ENABLE_NLS
+#ifdef USE_M17N
+#ifdef ENABLE_NLS
OptionCharset = SystemCharset; /* FIXME */
#endif
+#endif
fputs("\nconfiguration parameters\n", fp);
for (j = 0; sections[j].name != NULL; j++) {
@@ -1310,10 +1312,10 @@ load_option_panel(void)
if (optionpanel_str == NULL)
optionpanel_str = Sprintf(optionpanel_src1, w3m_version,
html_quote(localCookie()->ptr), _(CMT_HELPER));
-#if ENABLE_NLS
+#ifdef USE_M17N
+#ifdef ENABLE_NLS
OptionCharset = SystemCharset; /* FIXME */
#endif
-#ifdef USE_M17N
if (!OptionEncode) {
optionpanel_str =
wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset);