summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 07:07:21 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 07:07:21 +0000
commit76f10cf8a456e00f12546379973a70ba7ae52b02 (patch)
tree800cc470d1eeb929d17c02973332636bcee59dbb
parent046aa3f55e864d2895f398f65fd24a7427c5a27a (diff)
* re.c (append_utf8): use rb_utf8_encoding() instead of
rb_enc_find("utf-8"). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--re.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 85c9b9bd2..5118d2112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 21 16:06:13 2007 Tanaka Akira <akr@fsij.org>
+
+ * re.c (append_utf8): use rb_utf8_encoding() instead of
+ rb_enc_find("utf-8").
+
Fri Dec 21 15:59:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_init): use enc_register_at() directly.
diff --git a/re.c b/re.c
index 9306ae7bf..16c9b55d4 100644
--- a/re.c
+++ b/re.c
@@ -1708,8 +1708,8 @@ append_utf8(unsigned long uv,
rb_str_buf_cat(buf, utf8buf, len);
if (*encp == 0)
- *encp = rb_enc_find("utf-8");
- else if (*encp != rb_enc_find("utf-8")) {
+ *encp = rb_utf8_encoding();
+ else if (*encp != rb_utf8_encoding()) {
strcpy(err, "UTF-8 character in non UTF-8 regexp");
return -1;
}