commit 300fa7cd2846ea1482946291f320c6ae4b06414b
parent b60abbce515fb04b9fbb34caaa351a35d2b63edb
Author: htrb <htrb>
Date: Tue, 3 Aug 2010 10:25:23 +0000
[w3m-dev 04363] Re: w3m's bugs from bugs.debian.org
remove codes for Debian
revert manpages
Diffstat:
4 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-03 d+w3m@vdr.jp
+
+ * [w3m-dev 04363] Re: w3m's bugs from bugs.debian.org
+ * doc/w3m.1: revert option -S
+ * doc-jp/w3m.1: revert option -S, -e, -j and -s
+ * main.c: remove codes for Debian
+
2010-08-03 Ito Hiroyuki <ZXB01226@nifty.com>
* [w3m-dev 04343]
diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1
@@ -39,6 +39,15 @@ text/plain
標準入力の内容を表示するときに保存される最大行数を指定する．
デフォルトは10000．
.TP
+.B \-s
+Shift_JISコードで表示する．
+.TP
+.B \-e
+EUCコードで表示する．
+.TP
+.B \-j
+JIS (ISO-2022-JP)コードで表示する．
+.TP
.BI \-O\ e|s|j|N|m
表示に使う文字コードを指定する.
.TP
@@ -81,7 +90,7 @@ Bookmark
.B \-F
フレームを自動表示する．
.TP
-.B \-s
+.B \-S
連続する空行を1行にまとめて表示する．
.TP
.B \-X
diff --git a/doc/w3m.1 b/doc/w3m.1
@@ -120,7 +120,7 @@ use cookie.
.B -no-cookie
don't use cookie
.TP
-.B -s
+.B -S
squeeze multiple blank lines
.TP
.B -W
diff --git a/main.c b/main.c
@@ -194,12 +194,10 @@ fusage(FILE * f, int err)
#ifdef USE_M17N
fprintf(f, " -I charset document charset\n");
fprintf(f, " -O charset display/output charset\n");
-#ifndef DEBIAN /* disabled by ukai: -s is used for squeeze multi lines */
fprintf(f, " -e EUC-JP\n");
fprintf(f, " -s Shift_JIS\n");
fprintf(f, " -j JIS\n");
#endif
-#endif
fprintf(f, " -B load bookmark\n");
fprintf(f, " -bookmark file specify bookmark file\n");
fprintf(f, " -T type specify content-type\n");
@@ -244,11 +242,7 @@ fusage(FILE * f, int err)
#endif /* USE_COOKIE */
fprintf(f, " -graph use graphic character\n");
fprintf(f, " -no-graph don't use graphic character\n");
-#ifdef DEBIAN /* replaced by ukai: pager requires -s */
- fprintf(f, " -s squeeze multiple blank lines\n");
-#else
fprintf(f, " -S squeeze multiple blank lines\n");
-#endif
fprintf(f, " -W toggle wrap search mode\n");
fprintf(f, " -X don't use termcap init/deinit\n");
fprintf(f,
@@ -530,14 +524,12 @@ main(int argc, char **argv, char **envp)
PagerMax = atoi(argv[i]);
}
#ifdef USE_M17N
-#ifndef DEBIAN /* XXX: use -o kanjicode={S|J|E} */
else if (!strcmp("-s", argv[i]))
DisplayCharset = WC_CES_SHIFT_JIS;
else if (!strcmp("-j", argv[i]))
DisplayCharset = WC_CES_ISO_2022_JP;
else if (!strcmp("-e", argv[i]))
DisplayCharset = WC_CES_EUC_JP;
-#endif
else if (!strncmp("-I", argv[i], 2)) {
if (argv[i][2] != '\0')
p = argv[i] + 2;
@@ -702,11 +694,7 @@ main(int argc, char **argv, char **envp)
accept_cookie = TRUE;
}
#endif /* USE_COOKIE */
-#ifdef DEBIAN
- else if (!strcmp("-s", argv[i]))
-#else
else if (!strcmp("-S", argv[i]))
-#endif
squeezeBlankLine = TRUE;
else if (!strcmp("-X", argv[i]))
Do_not_use_ti_te = TRUE;
@@ -862,12 +850,6 @@ main(int argc, char **argv, char **envp)
w3m_version,
"<br>Written by <a href='mailto:aito@fw.ipsj.or.jp'>Akinori Ito</a>",
NULL);
-#ifdef DEBIAN
- Strcat_m_charp(s_page,
- "<p>Debian package is maintained by <a href='mailto:ukai@debian.or.jp'>Fumitoshi UKAI</a>.",
- "You can read <a href='file:///usr/share/doc/w3m/'>w3m documents on your local system</a>.",
- NULL);
-#endif /* DEBIAN */
newbuf = loadHTMLString(s_page);
if (newbuf == NULL)
Strcat_charp(err_msg, "w3m: Can't load string.\n");
