aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--rc.c22
2 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 65a4bbb..4af3a63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-16 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 02835]
+ * rc.c: move label_topline, nextpage_topline from param3 to param1
+ param7 is SSL Setting
+
2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02834] mailto: use external program
@@ -1943,4 +1949,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.219 2002/01/15 05:50:51 ukai Exp $
+$Id: ChangeLog,v 1.220 2002/01/15 16:07:58 ukai Exp $
diff --git a/rc.c b/rc.c
index d9be20a..31205ff 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.27 2002/01/15 15:58:02 ukai Exp $ */
+/* $Id: rc.c,v 1.28 2002/01/15 16:07:58 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -401,6 +401,14 @@ struct param_ptr params1[] = {
{"show_lnum", P_INT, PI_ONOFF, (void *)&showLineNum, CMT_SHOW_NUM, NULL},
{"show_srch_str", P_INT, PI_ONOFF, (void *)&show_srch_str,
CMT_SHOW_SRCH_STR, NULL},
+#ifdef LABEL_TOPLINE
+ {"label_topline", P_INT, PI_ONOFF, (void *)&label_topline,
+ CMT_LABEL_TOPLINE, NULL},
+#endif
+#ifdef NEXTPAGE_TOPLINE
+ {"nextpage_topline", P_INT, PI_ONOFF, (void *)&nextpage_topline,
+ CMT_NEXTPAGE_TOPLINE, NULL},
+#endif
{NULL, 0, 0, NULL, NULL, NULL},
};
@@ -450,14 +458,6 @@ struct param_ptr params3[] = {
{"vi_prec_num", P_INT, PI_ONOFF, (void *)&vi_prec_num, CMT_VI_PREC_NUM,
NULL},
#endif
-#ifdef LABEL_TOPLINE
- {"label_topline", P_INT, PI_ONOFF, (void *)&label_topline,
- CMT_LABEL_TOPLINE, NULL},
-#endif
-#ifdef NEXTPAGE_TOPLINE
- {"nextpage_topline", P_INT, PI_ONOFF, (void *)&nextpage_topline,
- CMT_NEXTPAGE_TOPLINE, NULL},
-#endif
{"wrap_search", P_INT, PI_ONOFF, (void *)&WrapDefault, CMT_WRAP, NULL},
{"ignorecase_search", P_INT, PI_ONOFF, (void *)&IgnoreCase,
CMT_IGNORE_CASE, NULL},
@@ -598,7 +598,7 @@ struct param_section sections[] = {
{"ネットワークの設定", params9},
{"プロキシの設定", params4},
#ifdef USE_SSL
- {"SSL認証設定", params7},
+ {"SSLの設定", params7},
#endif
#ifdef USE_COOKIE
{"クッキーの設定", params8},
@@ -614,7 +614,7 @@ struct param_section sections[] = {
{"Network Setting", params9},
{"Proxy Setting", params4},
#ifdef USE_SSL
- {"SSL Verification Setting", params7},
+ {"SSL Setting", params7},
#endif
#ifdef USE_COOKIE
{"Cookie Setting", params8},