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

On Mon, Jul 19, 2010 at 06:13:40PM +0900, Hiroyuki Ito wrote:
> 
> 
> > * 010_w3m.1-debian-fix.patch
> > * 020_ja-w3m.1-debian-fix.patch
> > 
> > http://patch-tracker.debian.org/patch/series/view/w3m/0.5.2-4/03-w3m.1-debian-fix
> > http://patch-tracker.debian.org/patch/series/view/w3m/0.5.2-4/04-ja-w3m.1-debian-fix


 manpage  -s -e -j 
-S  -s manpage 
Debian 



[w3m-dev 01254] squeeze multiple blank lines option ( http://bugs.debian.org/75527 )
http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200010.month/1254.html
http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200010.month/1275.html


 2 revert 

 Debian 
 Debian 

-- 
Regards,
	dai

GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E

--- w3m-cvs-0803.orig/main.c	2010-07-26 09:16:53.000000000 +0900
+++ w3m-cvs-0803/main.c	2010-08-03 18:23:24.000000000 +0900
@@ -194,12 +194,10 @@
 #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");
@@ -245,11 +243,7 @@
     fprintf(f, "    -pauth user:pass proxy authentication\n");
     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 @@
 		    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;
@@ -713,11 +705,7 @@
 		    argv[i]++;
 		}
 	    }
-#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;
@@ -873,12 +861,6 @@
 			   w3m_version,
 			   "<br>Written by <a href='mailto:[email protected]'>Akinori Ito</a>",
 			   NULL);
-#ifdef DEBIAN
-	    Strcat_m_charp(s_page,
-			   "<p>Debian package is maintained by <a href='mailto:[email protected]'>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");