Merge branch 'release-5.29.2' into blead

[perl5.git] / lib / English.pm

diff --git a/lib/English.pm b/lib/English.pm
index e4ee10a..e40cc12 100644 (file)
--- a/lib/English.pm
+++ b/lib/English.pm
@@ -1,6 +1,6 @@
 package English;
 
-our $VERSION = '1.07';
+our $VERSION = '1.10';
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -34,9 +34,9 @@ See L<perlvar> for a complete list of these.
 
 =head1 PERFORMANCE
 
-NOTE: This was fixed in perl 5.18.  Mentioning these three variables no
+NOTE: This was fixed in perl 5.20.  Mentioning these three variables no
 longer makes a speed difference.  This section still applies if your code
-is to run on perl 5.16 or earlier.
+is to run on perl 5.18 or earlier.
 
 This module can provoke sizeable inefficiencies for regular expressions,
 due to unfortunate implementation details.  If performance matters in
@@ -119,6 +119,7 @@ sub import {
        *EGID
        *PROGRAM_NAME
        *PERL_VERSION
+       *OLD_PERL_VERSION
        *ACCUMULATOR
        *COMPILING
        *DEBUGGING
@@ -181,7 +182,7 @@ sub import {
 
        *FORMAT_PAGE_NUMBER                     = *%    ;
        *FORMAT_LINES_PER_PAGE                  = *=    ;
-       *FORMAT_LINES_LEFT                      = *-    ;
+       *FORMAT_LINES_LEFT                      = *-{SCALAR}    ;
        *FORMAT_NAME                            = *~    ;
        *FORMAT_TOP_NAME                        = *^    ;
        *FORMAT_LINE_BREAK_CHARACTERS           = *:    ;
@@ -214,6 +215,7 @@ sub import {
 # Internals.
 
        *PERL_VERSION                           = *^V   ;
+       *OLD_PERL_VERSION                       = *]    ;
        *ACCUMULATOR                            = *^A   ;
        *COMPILING                              = *^C   ;
        *DEBUGGING                              = *^D   ;
@@ -231,6 +233,5 @@ sub import {
 
 #      *ARRAY_BASE                             = *[    ;
 #      *OFMT                                   = *#    ;
-#      *OLD_PERL_VERSION                       = *]    ;
 
 1;