Merge maint-5.004 branch (5.004_01) with mainline.

p4raw-id: //depot/perl@84

1 files changed, 9 insertions, 1 deletions

diff --git a/regcomp.c b/regcomp.c
index 516cfef151..43b51648eb 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -907,7 +907,9 @@ tryagain:
 		    goto defchar;
 		else {
 		    regsawback = 1;
-		    ret = reganode(REF, num);
+		    ret = reganode((regflags & PMf_FOLD)
+				   ? ((regflags & PMf_LOCALE) ? REFFL : REFF)
+				   : REF, num);
 		    *flagp |= HASWIDTH;
 		    while (isDIGIT(*regparse))
 			regparse++;
@@ -1671,6 +1673,12 @@ char *o;
     case REF:
 	sv_catpvf(sv, "REF%d", ARG1(o));
 	break;
+    case REFF:
+	sv_catpvf(sv, "REFF%d", ARG1(o));
+	break;
+    case REFFL:
+	sv_catpvf(sv, "REFFL%d", ARG1(o));
+	break;
     case OPEN:
 	sv_catpvf(sv, "OPEN%d", ARG1(o));
 	break;