X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_ctl.c;h=1605e216842845539e0698bd07c1c8b743412283;hb=8ff9412f9ef1dbdabee4f0993653e1446d7a88c8;hp=6ba97c8a74177abc86b145eff298a17df7f54432;hpb=d6ae682c3b074305be42218c870675979298d3f9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_ctl.c b/pp_ctl.c
index 6ba97c8..1605e21 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -89,13 +89,12 @@ PP(pp_regcomp)
     
     tmpstr = POPs;
 
-     /* prevent recompiling under /o and ithreads. */
+    /* prevent recompiling under /o and ithreads. */
 #if defined(USE_ITHREADS) || defined(USE_THREADS)
-     if (pm->op_pmflags & PMf_KEEP && PM_GETRE(pm))
-	  RETURN;
+    if (pm->op_pmflags & PMf_KEEP && PM_GETRE(pm))
+	 RETURN;
 #endif
 
-    tmpstr = POPs;
     if (SvROK(tmpstr)) {
 	SV *sv = SvRV(tmpstr);
 	if(SvMAGICAL(sv))
@@ -150,6 +149,8 @@ PP(pp_regcomp)
 	pm = PL_curpm;
     else if (strEQ("\\s+", PM_GETRE(pm)->precomp))
 	pm->op_pmflags |= PMf_WHITE;
+    else
+	pm->op_pmflags &= ~PMf_WHITE;
 
     /* XXX runtime compiled output needs to move to the pad */
     if (pm->op_pmflags & PMf_KEEP) {
@@ -1550,7 +1551,7 @@ PP(pp_caller)
 
     if (MAXARG)
 	count = POPi;
-    EXTEND(SP, 10);
+
     for (;;) {
 	/* we may be in a higher stacklevel, so dig down deeper */
 	while (cxix < 0 && top_si->si_type != PERLSI_MAIN) {
@@ -1559,8 +1560,10 @@ PP(pp_caller)
 	    cxix = dopoptosub_at(ccstack, top_si->si_cxix);
 	}
 	if (cxix < 0) {
-	    if (GIMME != G_ARRAY)
+	    if (GIMME != G_ARRAY) {
+		EXTEND(SP, 1);
 		RETPUSHUNDEF;
+            }
 	    RETURN;
 	}
 	if (PL_DBsub && cxix >= 0 &&
@@ -1582,6 +1585,7 @@ PP(pp_caller)
 
     stashname = CopSTASHPV(cx->blk_oldcop);
     if (GIMME != G_ARRAY) {
+        EXTEND(SP, 1);
 	if (!stashname)
 	    PUSHs(&PL_sv_undef);
 	else {
@@ -1592,6 +1596,8 @@ PP(pp_caller)
 	RETURN;
     }
 
+    EXTEND(SP, 10);
+
     if (!stashname)
 	PUSHs(&PL_sv_undef);
     else