From: Hugo van der Sanden <hv@crypt.org>
Date: Thu, 24 Oct 2002 22:34:10 +0000 (+0000)
Subject: Reverse change #8066 and sense of test, to satisfy [perl #17763]
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bf12611a95159ce0683344ec99968bd2838c9d0e;p=p5sagit%2Fp5-mst-13.2.git

Reverse change #8066 and sense of test, to satisfy [perl #17763]
p4raw-link: @8066 on //depot/perl: bf484eac86d1083a9dc1877646bb27c0a016b364

p4raw-id: //depot/perl@18055
---

diff --git a/pp_sys.c b/pp_sys.c
index 8e03168..2d27d86 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -457,7 +457,7 @@ PP(pp_die)
     }
     else {
 	tmpsv = TOPs;
-        tmps = (SvROK(tmpsv) && PL_in_eval) ? Nullch : SvPV(tmpsv, len);
+        tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, len);
     }
     if (!tmps || !len) {
   	SV *error = ERRSV;
diff --git a/t/run/fresh_perl.t b/t/run/fresh_perl.t
index eb83269..f8bf4b3 100644
--- a/t/run/fresh_perl.t
+++ b/t/run/fresh_perl.t
@@ -616,9 +616,11 @@ for (@locales) {
 }
 EXPECT
 ########
+# [ID 20001202.002] and change #8066 added 'at -e line 1';
+# reversed again as a result of [perl #17763]
 die qr(x)
 EXPECT
-(?-xism:x) at - line 1.
+(?-xism:x)
 ########
 # 20001210.003 mjd@plover.com
 format REMITOUT_TOP =