Quotes fixed, see also perl #36079

[p5sagit/p5-mst-13.2.git] / lib / Carp.pm

diff --git a/lib/Carp.pm b/lib/Carp.pm
index 86f0d92..d2854c0 100644 (file)
--- a/lib/Carp.pm
+++ b/lib/Carp.pm
@@ -1,6 +1,6 @@
 package Carp;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 =head1 NAME
 
@@ -178,9 +178,11 @@ Defaults to C<0>.
 
 =cut
 
-
+# disable these by default, so they can live w/o require Carp
 $CarpInternal{Carp}++;
 $CarpInternal{warnings}++;
+$Internal{Exporter}++;
+$Internal{'Exporter::Heavy'}++;
 $CarpLevel = 0;     # How many extra package levels to skip on carp.
                     # How many calls to skip on confess.
                     # Reconciling these notions is hard, use
@@ -224,8 +226,8 @@ sub export_fail {
 
 sub longmess {
     {
-       local $@;
-       # XXX fix require to not clear $@?
+       local($@, $!);
+       # XXX fix require to not clear $@ or $!?
        # don't use require unless we need to (for Safe compartments)
        require Carp::Heavy unless $INC{"Carp/Heavy.pm"};
     }
@@ -249,8 +251,8 @@ sub longmess {
 
 sub shortmess {        # Short-circuit &longmess if called via multiple packages
     {
-       local $@;
-       # XXX fix require to not clear $@?
+       local($@, $!);
+       # XXX fix require to not clear $@ or $!?
        # don't use require unless we need to (for Safe compartments)
        require Carp::Heavy unless $INC{"Carp/Heavy.pm"};
     }