1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c97213bd41..c97aa00434 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 07:06:31 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().