← Back to branch summary

~ubuntu-branches/ubuntu/karmic/w3m/karmic

« back to all changes in this revision

Viewing changes to debian/patches/10-w3mman-keep-formatting

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-30 11:49:15 UTC
  • Revision ID: james.westby@ubuntu.com-20090630114915-5am1dawuqacpsthc
Tags: 0.5.2-2ubuntu1
http://bugs.debian.org/325699
http://bugs.debian.org/426362
https://launchpad.net/bugs/283975
debian/patches/10-w3mman-keep-formatting: Set MAN_KEEP_FORMATTING=1 to
instruct man to preserve formatting characters in its output rather than
filtering them through col (closes: #325699, #426362; LP: #283975,
#353900).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10-w3mman-keep-formatting
 
1
Description: Instruct man to preserve formatting characters in its output
 
2
 rather than filtering them through col. Works as of man-db 2.5.0, but is
 
3
 harmless with older versions.
 
4
Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=325699
 
5
Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/353900
 
6
 
 
7
Index: b/scripts/w3mman/w3mman2html.cgi.in
 
8
===================================================================
 
9
--- a/scripts/w3mman/w3mman2html.cgi.in
 
10
+++ b/scripts/w3mman/w3mman2html.cgi.in
 
11
@@ -76,7 +76,7 @@
 
12
   if (! ($file =~ /^\//)) {
 
13
     $file = $query{"pwd"} . '/' . $file;
 
14
   }
 
15
-  open(F, "$MAN -l $file 2> /dev/null |");
 
16
+  open(F, "MAN_KEEP_FORMATTING=1 $MAN -l $file 2> /dev/null |");
 
17
 } else {
 
18
   $man = $query{"man"};
 
19
   if ($man =~ s/\((\w+)\)$//) {
 
20
@@ -92,7 +92,7 @@
 
21
 
 
22
   $section =~ s:([^-\w\200-\377.,])::g;
 
23
   $man =~ s:([^-\w\200-\377.,])::g;
 
24
-  open(F, "$MAN $section $man 2> /dev/null |");
 
25
+  open(F, "MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |");
 
26
 }
 
27
 $ok = 0;
 
28
 undef $header;