Description: Change the -s option to "squeeze multiple blank lines" for pager Change the -s option from "display charset Shift_JIS" to "squeeze multiple blank lines" to work as /usr/bin/pager. In addition, the options -j and -e are disabled. To specify the display charset, use -O{s|j|e} instead. . The patch was committed to the upstream on 2000-10-27. However, it was rejected because of Debian specific on 2010-08-03. Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200010.month/1275.html Bug-Debian: http://bugs.debian.org/75527 diff -urN w3m.orig/main.c w3m/main.c --- w3m.orig/main.c 2010-08-04 23:06:36.000000000 +0900 +++ w3m/main.c 2010-08-05 19:28:46.000000000 +0900 @@ -194,10 +194,12 @@ #ifdef USE_M17N fprintf(f, " -I charset document charset\n"); fprintf(f, " -O charset display/output charset\n"); +#if 0 /* use -O{s|j|e} instead */ 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"); @@ -242,7 +244,11 @@ #endif /* USE_COOKIE */ fprintf(f, " -graph use DEC special graphics for border of table and menu\n"); fprintf(f, " -no-graph use ACII character for border of table and menu\n"); +#if 1 /* 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, @@ -524,12 +530,14 @@ PagerMax = atoi(argv[i]); } #ifdef USE_M17N +#if 0 /* use -O{s|j|e} instead */ 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; @@ -694,7 +702,11 @@ accept_cookie = TRUE; } #endif /* USE_COOKIE */ +#if 1 /* pager requires -s */ + 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; commit 7d4d6cdd31f09b964f436651217dd0e2488e5e7b Author: Tatsuya Kinoshita <tats@debian.org> Date: Sun Oct 13 14:06:32 2013 +0900 Update document for the -s option change diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html index 41d70f1..f197cfb 100644 --- a/doc-jp/MANUAL.html +++ b/doc-jp/MANUAL.html @@ -51,15 +51,9 @@ w3m <dt>-l �Կ� <dd>ɸ�����Ϥ����Ƥ�ɽ������Ȥ�����¸��������Կ�����ꤹ �롥�ǥե���Ȥ� 10000�� -<dt>-s -<dd>Shift_JIS �����ɤ�ɽ�����롥 -<dt>-e -<dd>EUC �����ɤ�ɽ�����롥 -<dt>-j -<dd>JIS(ISO-2022-JP) �����ɤ�ɽ�����롥 -<dt>-O e|s|j|N|m|n +<dt>-O ʸ�������� <dd>ɽ�����Ѥ���ʸ�������ɤ���ꤹ�롥 -<dt>-I e|s +<dt>-I ʸ�������� <dd>����ʸ���ʸ�������ɤ���ꤹ�롥 <dt>-T ������ <dd>ɽ������ʸ��Υ����פ���ꤹ�롥���λ��꤬�ʤ���硤�ե����� @@ -89,7 +83,7 @@ HTML <dd>���顼ɽ���ʤ��� <dt>-F <dd>�ե졼���ưɽ�����롥 -<dt>-S +<dt>-s <dd>Ϣ³������Ԥ�1�ԤˤޤȤ��ɽ�����롥 <dt>-X <dd>w3m��λ���ˡ������β��̤����ʤ��� diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1 index 89aacb6..099a803 100644 --- a/doc-jp/w3m.1 +++ b/doc-jp/w3m.1 @@ -39,19 +39,10 @@ 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 +.BI \-O\ ʸ�������� ɽ���˻Ȥ�ʸ�������ɤ���ꤹ��. .TP -.BI \-I\ e|s +.BI \-I\ ʸ�������� ����ʸ���ʸ�������ɤ���ꤹ�롥 .TP .BI \-T\ ������ @@ -90,7 +81,7 @@ Bookmark .B \-F �ե졼���ưɽ�����롥 .TP -.B \-S +.B \-s Ϣ³������Ԥ�1�ԤˤޤȤ��ɽ�����롥 .TP .B \-X diff --git a/doc/MANUAL.html b/doc/MANUAL.html index aff0189..0a00b59 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -55,12 +55,10 @@ If you don't specify this option, <dt>-l number <dd>Specify line number preserved internally when reading text/plain document fron standard input. Default is 10000. -<dt>-s -<dd>Display documents with Shift_JIS code. -<dt>-e -<dd>Display documents with EUC_JP code. -<dt>-j -<dd>Display documents with ISO-2022-JP code. +<dt>-O charset +<dd>Specify display/output charset. +<dt>-I charset +<dd>Specify document charset. <dt>-T type <dd>Specify document type. Without this option, document type is determined from extension of a file. If the determination @@ -90,7 +88,7 @@ It is useful when reading E-mail or NetNews messages. <dd>Monochrome display mode. <dt>-F <dd>Automatically render frame. -<dt>-S +<dt>-s <dd>Squeeze blank lines. <dt>-X <dd>Upon exit, do not display preserved screen. diff --git a/doc/w3m.1 b/doc/w3m.1 index aeb4a60..da4fdbb 100644 --- a/doc/w3m.1 +++ b/doc/w3m.1 @@ -143,7 +143,7 @@ use graphic character .B -no-graph don't use graphic character .TP -.B -S +.B -s squeeze multiple blank lines .TP .B -W