aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--re.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f6626a6f07..ed64ff1128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,6 @@ Thu Feb 4 15:35:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to
make fstring with encoding.
- * re.c (rb_reg_initialize): make fstring without copying.
-
Thu Feb 4 14:42:29 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* common.mk: Added Unicode data file SpecialCasing.txt to be additionally
diff --git a/re.c b/re.c
index d4352d340d..69cbc687e7 100644
--- a/re.c
+++ b/re.c
@@ -2580,7 +2580,7 @@ rb_reg_initialize(VALUE obj, const char *s, long len, rb_encoding *enc,
options & ARG_REG_OPTION_MASK, err,
sourcefile, sourceline);
if (!re->ptr) return -1;
- RB_OBJ_WRITE(obj, &re->src, rb_fstring_enc_new(s, len, enc));
+ RB_OBJ_WRITE(obj, &re->src, rb_fstring(rb_enc_str_new(s, len, enc)));
RB_GC_GUARD(unescaped);
return 0;
}