[win32] Initial reverse integration of winansi branch.

p4raw-id: //depot/win32/perl@285

1 files changed, 4 insertions, 5 deletions

diff --git a/op.c b/op.c
index d7a6fe4e16..2d9706bb08 100644
--- a/op.c
+++ b/op.c
@@ -531,8 +531,7 @@ find_threadsv(char *name)
 	case '\'':
 	    sawampersand = TRUE;
 	    SvREADONLY_on(sv);
-	    sv_magic(sv, 0, 0, name, 1); 
-	    break;
+	    /* FALL THROUGH */
 	default:
 	    sv_magic(sv, 0, 0, name, 1); 
 	}
@@ -3438,9 +3437,9 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block)
 	    CV *cv;
 	    HV *hv;
 
-	    sv_setpvf(sv, "%_:%ld-%ld",
-		    GvSV(curcop->cop_filegv),
-		    (long)subline, (long)curcop->cop_line);
+	    sv_setpvf(sv, "%_:%ld-%ld", GvSV(curcop->cop_filegv),
+		    (long)(subline < 0 ? -subline : subline),
+		    (long)curcop->cop_line);
 	    gv_efullname3(tmpstr, gv, Nullch);
 	    hv_store(GvHV(DBsub), SvPVX(tmpstr), SvCUR(tmpstr), sv, 0);
 	    if (!db_postponed) {