summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorJames E Keenan <jkeenan@cpan.org>2017-03-17 19:10:50 -0400
committerJames E Keenan <jkeenan@cpan.org>2017-03-17 19:10:50 -0400
commit6aff4bf3cdbe7898ab6d2fb6c691e278cfd5e80f (patch)
treeb4b5b4acfe45baee950cf119e944b58491859ec4 /cpan
parent281fe5e7055b0d2374f99ba00af0e45f22386854 (diff)
downloadperl-6aff4bf3cdbe7898ab6d2fb6c691e278cfd5e80f.tar.gz
Sync Pod-Perldoc with CPAN version 3.28.
This should enable us to close https://rt.perl.org/Ticket/Display.html?id=130759.
Diffstat (limited to 'cpan')
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc.pm19
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm42
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm2
13 files changed, 61 insertions, 22 deletions
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
index 1999f018ef..8d695b2b4b 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
@@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir);
use vars qw($VERSION @Pagers $Bindir $Pod2man
$Temp_Files_Created $Temp_File_Lifetime
);
-$VERSION = '3.27';
+$VERSION = '3.28';
#..........................................................................
@@ -851,8 +851,11 @@ sub grand_search_init {
=~ s/\.P(?:[ML]|OD)\z//;
}
else {
- print STDERR "No " .
+ print STDERR "No " .
($self->opt_m ? "module" : "documentation") . " found for \"$_\".\n";
+ if ( /^https/ ) {
+ print STDERR "You may need an SSL library (such as IO::Socket::SSL) for that URL.\n";
+ }
}
next;
}
@@ -1697,7 +1700,7 @@ sub pagers_guessing {
unshift @pagers, "$ENV{PERLDOC_PAGER} <" if $ENV{PERLDOC_PAGER};
}
- $self->aside("Pagers: ", @pagers);
+ $self->aside("Pagers: ", (join ", ", @pagers));
return;
}
@@ -1934,11 +1937,11 @@ sub page { # apply a pager to the output file
} elsif($self->is_amigaos) {
last if system($pager, $output) == 0;
} else {
- # fix visible escape codes in ToTerm output
- # https://bugs.debian.org/758689
- local $ENV{LESS} = defined $ENV{LESS} ? "$ENV{LESS} -R" : "-R";
- # On FreeBSD, the default pager is more.
- local $ENV{MORE} = defined $ENV{MORE} ? "$ENV{MORE} -R" : "-R";
+ my $formatter = $self->{'formatter_class'};
+ if ( $formatter->can('pager_configuration') ) {
+ $self->aside("About to call $formatter" . "->pager_configuration(\"$pager\")\n");
+ $formatter->pager_configuration($pager, $self);
+ }
last if system("$pager \"$output\"") == 0;
}
}
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
index 5bab1e3cbe..37f651047d 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
use Carp qw(croak carp);
use Config qw(%Config);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
index e88f0d362e..afa2574ec7 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
@@ -2,7 +2,7 @@ package Pod::Perldoc::GetOptsOO;
use strict;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
BEGIN { # Make a DEBUG constant ASAP
*DEBUG = defined( &Pod::Perldoc::DEBUG )
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
index aa41423bfe..8217c7b1bc 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
sub is_pageable { 1 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
index 7420c454e9..a6dbbe3f03 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
@@ -4,7 +4,7 @@ use warnings;
use vars qw(@ISA);
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
# Pick our superclass...
#
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
index 6e18b3714d..bfcb5c40ee 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
@@ -5,7 +5,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
use File::Spec::Functions qw(catfile);
use Pod::Man 2.18;
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
index ec9dc2222f..a52f616019 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
# This is unlike ToMan.pm in that it emits the raw nroff source!
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
index 0eda0af43f..825a1caaf5 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
sub is_pageable { 1 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
index 69bc25426c..d084816cab 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw( Pod::Simple::RTF );
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
sub is_pageable { 0 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
index 64cfb01135..9501d6310e 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
use parent qw(Pod::Perldoc::BaseTo);
@@ -26,6 +26,34 @@ sub width {
$self->_get_default_width;
}
+sub pager_configuration {
+ my($self, $pager, $perldoc) = @_;
+
+ # do not modify anything on Windows or DOS
+ return if ( $perldoc->is_mswin32 || $perldoc->is_dos );
+
+ if ( $pager =~ /less/ ) {
+ $self->_maybe_modify_environment('LESS');
+ }
+ elsif ( $pager =~ /more/ ) {
+ $self->_maybe_modify_environment('MORE');
+ }
+
+ return;
+}
+
+sub _maybe_modify_environment {
+ my($self, $name) = @_;
+
+ if ( ! defined $ENV{$name} ) {
+ $ENV{$name} = "-R";
+ }
+
+ # if the environment is set, don't modify
+ # anything
+
+}
+
sub _get_stty { `stty -a` }
sub _get_columns_from_stty {
@@ -89,7 +117,7 @@ sub parse_from_file {
=head1 NAME
-Pod::Perldoc::ToTerm - render Pod with terminal escapes
+Pod::Perldoc::ToTerm - render Pod with terminal escapes
=head1 SYNOPSIS
@@ -107,6 +135,14 @@ For example:
perldoc -o term -w indent:5 Some::Modulename
+=head1 PAGER FORMATTING
+
+Depending on the platform, and because this class emits terminal escapes it
+will attempt to set the C<-R> flag on your pager by injecting the flag into
+your environment variable for C<less> or C<more>.
+
+On Windows and DOS, this class will not modify any environment variables.
+
=head1 CAVEAT
This module may change to use a different text formatter class in the
@@ -118,7 +154,7 @@ L<Pod::Text>, L<Pod::Text::Termcap>, L<Pod::Perldoc>
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2011 Mark Allen.
+Copyright (c) 2017 Mark Allen.
This program is free software; you can redistribute it and/or modify it
under the terms of either: the GNU General Public License as published
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
index cdaaa4964d..99ab66c304 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
use parent qw(Pod::Perldoc::BaseTo);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
index 727b312614..6ca7542c7a 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
use parent qw(Pod::Perldoc::BaseTo);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
index ca1ab3c050..0161c048a9 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION);
use parent qw( Pod::Simple::XMLOutStream );
use vars qw($VERSION);
-$VERSION = '3.27';
+$VERSION = '3.28';
sub is_pageable { 0 }
sub write_with_binmode { 0 }