summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChip Salzenberg <chip@atlantic.net>1997-02-25 13:12:02 +1200
committerChip Salzenberg <chip@atlantic.net>1997-02-25 13:12:02 +1200
commit6dab866864880a00c46b7d744f81f4ffe2e2e259 (patch)
tree3cf51aca9a49ece9ecddf50091496813f1a38574 /lib
parenta24d8dfd085b8a93a9192688b8c3c59f4ae109e5 (diff)
downloadperl-6dab866864880a00c46b7d744f81f4ffe2e2e259.tar.gz
Follow up on elimination of $` $& $' in libraries
(this is the same change as commit efa45da9e2f446e4e79f819d2fa3a099e54425fa, but as applied)
Diffstat (limited to 'lib')
-rw-r--r--lib/Getopt/Long.pm4
-rw-r--r--lib/diagnostics.pm3
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/Getopt/Long.pm b/lib/Getopt/Long.pm
index fccdf9bc28..221cc54b39 100644
--- 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 0aa5b54195..26c31475a2 100644
--- 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 $_;