diff options
| author |   afresh1 <afresh1@openbsd.org> | 2014-11-17 20:52:31 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2014-11-17 20:52:31 +0000 |
| commit | 6fb12b7054efc6b436584db6cef9c2f85c0d7e27 (patch) | |
| tree | aa09a524574ec7ae2f521a24573deeecb78ff66a /gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm | |
| parent | Add the Cammelia cipher to libcrypto. (diff) | |
| download | wireguard-openbsd-6fb12b7054efc6b436584db6cef9c2f85c0d7e27.tar.xz wireguard-openbsd-6fb12b7054efc6b436584db6cef9c2f85c0d7e27.zip | |
Import perl-5.20.1
Diffstat (limited to 'gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm')
| -rw-r--r-- | gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm b/gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm index 1aa19d397ec..80a0d4bac88 100644 --- a/gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm +++ b/gnu/usr.bin/perl/dist/Term-ReadLine/lib/Term/ReadLine.pm @@ -203,7 +203,7 @@ use strict; package Term::ReadLine::Stub; our @ISA = qw'Term::ReadLine::Tk Term::ReadLine::TermCap'; -$DB::emacs = $DB::emacs; # To peacify -w +$DB::emacs = $DB::emacs; # To pacify -w our @rl_term_set; *rl_term_set = \@Term::ReadLine::TermCap::rl_term_set; @@ -223,7 +223,7 @@ sub readline { if (${^UNICODE} & PERL_UNICODE_STDIN || defined ${^ENCODING}) && utf8::valid($str); print $out $rl_term_set[3]; - # bug in 5.000: chomping empty string creats length -1: + # bug in 5.000: chomping empty string creates length -1: chomp $str if defined $str; $str; } @@ -320,7 +320,7 @@ sub Features { \%features } package Term::ReadLine; # So late to allow the above code be defined? -our $VERSION = '1.12'; +our $VERSION = '1.14'; my ($which) = exists $ENV{PERL_RL} ? split /\s+/, $ENV{PERL_RL} : undef; if ($which) { @@ -337,7 +337,7 @@ if ($which) { } elsif (defined $which and $which ne '') { # Defined but false # Do nothing fancy } else { - eval "use Term::ReadLine::Gnu; 1" or eval "use Term::ReadLine::Perl; 1"; + eval "use Term::ReadLine::Gnu; 1" or eval "use Term::ReadLine::EditLine; 1" or eval "use Term::ReadLine::Perl; 1"; } #require FileHandle; @@ -347,6 +347,8 @@ if ($which) { our @ISA; if (defined &Term::ReadLine::Gnu::readline) { @ISA = qw(Term::ReadLine::Gnu Term::ReadLine::Stub); +} elsif (defined &Term::ReadLine::EditLine::readline) { + @ISA = qw(Term::ReadLine::EditLine Term::ReadLine::Stub); } elsif (defined &Term::ReadLine::Perl::readline) { @ISA = qw(Term::ReadLine::Perl Term::ReadLine::Stub); } elsif (defined $which && defined &{"Term::ReadLine::$which\::readline"}) { @@ -469,7 +471,7 @@ sub get_line { if (${^UNICODE} & PERL_UNICODE_STDIN || defined ${^ENCODING}) && utf8::valid($str); print $out $rl_term_set[3]; - # bug in 5.000: chomping empty string creats length -1: + # bug in 5.000: chomping empty string creates length -1: chomp $str if defined $str; $str; |