From f4177b7e8c22015f1b4d7170d0048c924ed70aa4 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 13 Dec 2008 01:02:51 +0000 Subject: merges r20626 from trunk into ruby_1-9_1. * re.c (reg_enc_error): raise EncodingCompatibilityError for encoding incompatibility. [ruby-core:18600] * re.c (rb_reg_prepare_enc): more consistent error message. [ruby-core:18611] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f25611b27..3aa248afd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 11 13:09:01 2008 Yukihiro Matsumoto + + * re.c (reg_enc_error): raise EncodingCompatibilityError for + encoding incompatibility. [ruby-core:18600] + + * re.c (rb_reg_prepare_enc): more consistent error message. + [ruby-core:18611] + Fri Dec 12 19:29:07 2008 Yuki Sonoda (Yugui) * encoding.c (rb_enc_set_default_external): default_internal can be -- cgit