diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2014-11-29 03:24:05 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2014-11-29 03:24:05 +0000 |
| commit | ae0b65b0d8c4d68b68662c6acfa0d2e12e4bc076 (patch) | |
| tree | c3d331664c39ae33ac95d9f07c45c5b5e44f6b33 | |
| parent | Merge branch 'feature/debian-version' (diff) | |
| parent | Fix Perl warnings (diff) | |
| download | w3m-ae0b65b0d8c4d68b68662c6acfa0d2e12e4bc076.tar.gz w3m-ae0b65b0d8c4d68b68662c6acfa0d2e12e4bc076.zip | |
Merge branch 'bug/w3mman2html-utf8'
Diffstat (limited to '')
| -rw-r--r-- | scripts/w3mman/w3mman2html.cgi.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in index 2e3576c..2cd00f9 100644 --- a/scripts/w3mman/w3mman2html.cgi.in +++ b/scripts/w3mman/w3mman2html.cgi.in @@ -34,7 +34,6 @@ Content-Type: text/html EOF $keyword =~ s:([^-\w\200-\377.,])::g; open(F, "$MAN -k $keyword 2> /dev/null |"); - @line = (); while(<F>) { chop; $_ = &html_quote($_); @@ -158,7 +157,7 @@ EOF } s@(http|ftp)://[\w.\-/~]+[\w/]@<a href="$&">$&</a>@g; - s@(\W)(mailto:)?(\w[\w.\-]*\@\w[\w.\-]*\.[\w.\-]*\w)@$1<a href="mailto:$3">$2$3</a>@g; + s@\b(mailto:|)(\w[\w.\-]*\@\w[\w.\-]*\.[\w.\-]*\w)@<a href="mailto:$2">$1$2</a>@g; s@(\W)(\~?/[\w.][\w.\-/~]*)@$1 . &file_ref($2)@ge; s@(include(<\/?[bu]\>|\s)*\<)([\w.\-/]+)@$1 . &include_ref($3)@ge; if ($prev && m@^\s*(\<[bu]\>)*(\w[\w.\-]*)(\</[bu]\>)*(\([\dm]\w*\))@) { @@ -222,7 +221,7 @@ sub is_command { local($p); (! -d && -x) || return 0; - if (! defined(%PATH)) { + if (! %PATH) { for $p (split(":", $ENV{'PATH'})) { $p =~ s@/+$@@; $PATH{$p} = 1; |