Follow up on elimination of $` $& $' in libraries

(this is the same change as commit efa45da9e2f446e4e79f819d2fa3a099e54425fa, but as applied)

diff --git a/lib/Getopt/Long.pm b/lib/Getopt/Long.pm
index fccdf9b..221cc54 100644 (file)
--- a/lib/Getopt/Long.pm
+++ b/lib/Getopt/Long.pm
@@ -14,7 +14,7 @@ require Exporter;
 
 @ISA = qw(Exporter);
 @EXPORT = qw(&GetOptions $REQUIRE_ORDER $PERMUTE $RETURN_IN_ORDER);
-$VERSION = sprintf("%d.%02d", '$Revision: 2.6001 $ ' =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", '$Revision: 2.6002 $ ' =~ /(\d+)\.(\d+)/);
 use vars qw($autoabbrev $getopt_compat $ignorecase $bundling $order
            $passthrough $error $debug 
            $REQUIRE_ORDER $PERMUTE $RETURN_IN_ORDER
@@ -566,7 +566,7 @@ sub GetOptions {
        my $opt = shift (@optionlist);
 
        # Strip leading prefix so people can specify "--foo=i" if they like.
-       $opt = $+ if $opt =~ /^($genprefix)+(.*)/s;
+       $opt =~ s/^(?:$genprefix)+//s;
 
        if ( $opt eq '<>' ) {
            if ( (defined $userlinkage)

diff --git a/lib/diagnostics.pm b/lib/diagnostics.pm
index 0aa5b54..26c3147 100644 (file)
--- a/lib/diagnostics.pm
+++ b/lib/diagnostics.pm
@@ -163,7 +163,6 @@ Tom Christiansen F<E<lt>tchrist@mox.perl.comE<gt>>, 25 June 1995.
 =cut
 
 require 5.001;
-use English;
 use Carp;
 
 use Config;
@@ -177,7 +176,7 @@ else {
 $DEBUG ||= 0;
 my $WHOAMI = ref bless [];  # nobody's business, prolly not even mine
 
-$OUTPUT_AUTOFLUSH = 1;
+$| = 1;
 
 local $_;