diff options
| author |   afresh1 <afresh1@openbsd.org> | 2014-03-24 15:05:12 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2014-03-24 15:05:12 +0000 |
| commit | e9ce384231aabe5c5a622aa68cef46f2c5bfdb4a (patch) | |
| tree | 5029388537325eaad6674da4dab6714cda1644e5 /gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text | |
| parent | Import perl-5.18.2 (diff) | |
| download | wireguard-openbsd-e9ce384231aabe5c5a622aa68cef46f2c5bfdb4a.tar.xz wireguard-openbsd-e9ce384231aabe5c5a622aa68cef46f2c5bfdb4a.zip | |
Merge perl-5.18.2 plus local patches, remove old files
OK espie@ sthen@ deraadt@
Diffstat (limited to 'gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text')
| -rw-r--r-- | gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Tabs.pm | 12 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Wrap.pm | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Tabs.pm b/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Tabs.pm index 34d81ab8b7f..07fe2b8b021 100644 --- a/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Tabs.pm +++ b/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Tabs.pm @@ -1,4 +1,3 @@ - package Text::Tabs; require Exporter; @@ -7,7 +6,7 @@ require Exporter; @EXPORT = qw(expand unexpand $tabstop); use vars qw($VERSION $SUBVERSION $tabstop $debug); -$VERSION = 2012.0818; +$VERSION = 2013.0523; $SUBVERSION = 'modern'; use strict; @@ -157,7 +156,7 @@ C<local($Text::Tabs::tabstop)>. print unexpand $_; } -Instead of the shell's C<expand> comand, use: +Instead of the shell's C<expand> command, use: perl -MText::Tabs -n -e 'print expand $_' @@ -186,7 +185,8 @@ or otherwise deal with any other zero-, half-, and full-width characters. Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff. Copyright (C) 2005 Aristotle Pagaltzis -Copyright (C) 2012 Google, Inc. +Copyright (C) 2012-2013 Google, Inc. This module may be modified, used, copied, and redistributed at your own risk. -Publicly redistributed modified versions must use a different name. - +Although allowed by the preceding license, please do not publicly +redistribute modified versions of this code with the name "Text::Tabs" +unless it passes the unmodified Text::Tabs test suite. diff --git a/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Wrap.pm b/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Wrap.pm index 1b40ab4f2bd..db0d15f6106 100644 --- a/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Wrap.pm +++ b/gnu/usr.bin/perl/cpan/Text-Tabs/lib/Text/Wrap.pm @@ -7,7 +7,7 @@ require Exporter; @EXPORT = qw(wrap fill); @EXPORT_OK = qw($columns $break $huge); -$VERSION = 2012.0818; +$VERSION = 2013.0523; $SUBVERSION = 'modern'; use 5.010_000; @@ -64,7 +64,7 @@ sub wrap ? unexpand($nl . $lead . $1) : $nl . $lead . $1; $remainder = $2; - } elsif ($huge eq 'wrap' && $t =~ /\G((?:(?!=[^\n])\X){$ll})/gc) { + } elsif ($huge eq 'wrap' && $t =~ /\G((?:(?=[^\n])\X){$ll})/gc) { $r .= $unexpand ? unexpand($nl . $lead . $1) : $nl . $lead . $1; @@ -293,7 +293,8 @@ many many others. =head1 LICENSE Copyright (C) 1996-2009 David Muir Sharnoff. -Copyright (C) 2012 Google, Inc. +Copyright (C) 2012-2013 Google, Inc. This module may be modified, used, copied, and redistributed at your own risk. -Publicly redistributed modified versions must use a different name. - +Although allowed by the preceding license, please do not publicly +redistribute modified versions of this code with the name "Text::Wrap" +unless it passes the unmodified Text::Wrap test suite. |