1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38ff661107..5b7aa43150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Dec 28 18:36:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): need to escape if the coderage is invalid.
+
+	* error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
+	  function to raise syntax error, with source encoding'ed message.
+
+	* parse.y (compile_error): use above function.
+	  [ruby-core:33951] (#4217)
+
 Tue Dec 28 07:37:38 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ruby.c: parenthesize macro arguments.