storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 04363] Re: w3m's bugs from bugs.debian.org

Browse Source 
remove codes for Debian
revert manpages
This commit is contained in:
Ito Hiroyuki
2010-08-03 10:25:23 +00:00
parent 49883bb9cb
commit 7bba9d43e8
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -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]
@@ -9092,4 +9099,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.1025 2010/08/03 10:02:16 htrb Exp $
$Id: ChangeLog,v 1.1026 2010/08/03 10:25:23 htrb Exp $

11
doc-jp/w3m.1
View File

@@ -39,6 +39,15 @@ text/plain
ɸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Կ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤹ<EFBFBD>롥
<EFBFBD>ǥե<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD>10000<EFBFBD><EFBFBD>
.TP
.B \-s
Shift_JIS<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롥
.TP
.B \-e
EUC<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롥
.TP
.B \-j
JIS (ISO-2022-JP)<29><><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>롥
.TP
.BI \-O\ e|s|j|N|m
ɽ<EFBFBD><EFBFBD><EFBFBD>˻Ȥ<EFBFBD>ʸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤹ<EFBFBD><EFBFBD>.
.TP
@@ -81,7 +90,7 @@ Bookmark
.B \-F
<EFBFBD>ե졼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ưɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롥
.TP
.B \-s
.B \-S
Ϣ³<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ԥ<EFBFBD>1<EFBFBD>ԤˤޤȤ<EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롥
.TP
.B \-X

2
doc/w3m.1
View File

@@ -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

20
main.c
View File

@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.265 2010/08/03 10:02:16 htrb Exp $ */
/* $Id: main.c,v 1.266 2010/08/03 10:25:23 htrb Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -194,11 +194,9 @@ 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");
@@ -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");