Change 23630 by [EMAIL PROTECTED] on 2004/12/09 15:49:07
Upgrade to perldoc 3.14
Affected files ...
... //depot/perl/lib/Pod/Perldoc.pm#13 edit
... //depot/perl/lib/Pod/Perldoc/ToMan.pm#5 edit
Differences ...
==== //depot/perl/lib/Pod/Perldoc.pm#13 (text) ====
Index: perl/lib/Pod/Perldoc.pm
--- perl/lib/Pod/Perldoc.pm#12~22916~ Wed Jun 9 02:53:58 2004
+++ perl/lib/Pod/Perldoc.pm Thu Dec 9 07:49:07 2004
@@ -12,7 +12,7 @@
use vars qw($VERSION @Pagers $Bindir $Pod2man
$Temp_Files_Created $Temp_File_Lifetime
);
-$VERSION = '3.13';
+$VERSION = '3.14';
#..........................................................................
BEGIN { # Make a DEBUG constant very first thing...
@@ -1079,7 +1079,7 @@
my $spec;
do {
- $spec = sprintf "%s/perldoc_%s_T%x_%x%02x.%s", # used also in
MSWin_temp_cleanup
+ $spec = sprintf "%s\\perldoc_%s_T%x_%x%02x.%s", # used also in
MSWin_temp_cleanup
# Yes, we embed the create-time in the filename!
$tempdir,
$infix || 'x',
@@ -1232,6 +1232,13 @@
push @pagers, qw( more less pg view cat );
unshift @pagers, $ENV{PAGER} if $ENV{PAGER};
}
+
+ if (IS_Cygwin) {
+ if (($pagers[0] eq 'less') || ($pagers[0] eq '/usr/bin/less')) {
+ unshift @pagers, '/usr/bin/less -isrR';
+ }
+ }
+
unshift @pagers, $ENV{PERLDOC_PAGER} if $ENV{PERLDOC_PAGER};
return;
@@ -1494,6 +1501,12 @@
# extension get the wrong default extension (such as .LIS for TYPE)
$output = VMS::Filespec::rmsexpand($output, '.') if IS_VMS;
+
+ $output =~ s{/}{\\}g if IS_MSWin32 || IS_Dos;
+ # Altho "/" under MSWin is in theory good as a pathsep,
+ # many many corners of the OS don't like it. So we
+ # have to force it to be "\" to make everyone happy.
+
foreach my $pager (@pagers) {
$self->aside("About to try calling $pager $output\n");
if (IS_VMS) {
==== //depot/perl/lib/Pod/Perldoc/ToMan.pm#5 (text) ====
Index: perl/lib/Pod/Perldoc/ToMan.pm
--- perl/lib/Pod/Perldoc/ToMan.pm#4~22916~ Wed Jun 9 02:53:58 2004
+++ perl/lib/Pod/Perldoc/ToMan.pm Thu Dec 9 07:49:07 2004
@@ -72,10 +72,14 @@
$command .= ' -rLL=' . (int $c) . 'n' if $cols > 80;
}
+ if(Pod::Perldoc::IS_Cygwin) {
+ $command .= ' -c';
+ }
+
# I hear persistent reports that adding a -c switch to $render
# solves many people's problems. But I also hear that some mans
- # don't have a -c switch, so that adding it here would presumably
- # be a Bad Thing -- [EMAIL PROTECTED]
+ # don't have a -c switch, so that unconditionally adding it here
+ # would presumably be a Bad Thing -- [EMAIL PROTECTED]
$command .= " | col -x" if Pod::Perldoc::IS_HPUX;
End of Patch.
