2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aab459609d..d12f5e36b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jul 18 23:44:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (reg_enc_error): use rb_enc_get to get the encoding of
+	  a Regexp object. REGEXP(re)->ptr->enc is the encoding of the
+	  regexp engin for patterns and target strings.
+	  [ruby-core:23208]
+
 Sat Jul 18 17:43:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_hash_cmp): got rid of overflow.
diff --git a/re.c b/re.c
index 447728da09..7ccb46cc04 100644
--- a/re.c
+++ b/re.c
@@ -1181,7 +1181,7 @@ reg_enc_error(VALUE re, VALUE str)
 {
     rb_raise(rb_eEncCompatError,
 	     "incompatible encoding regexp match (%s regexp with %s string)",
-	     rb_enc_name(RREGEXP(re)->ptr->enc),
+	     rb_enc_name(rb_enc_get(re)),
 	     rb_enc_name(rb_enc_get(str)));
 }