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

2 files changed, 10 insertions, 2 deletions

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  <matz@ruby-lang.org>
+
+	* 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)  <yugui@yugui.jp>
 
 	* encoding.c (rb_enc_set_default_external): default_internal can be
diff --git a/re.c b/re.c
index a45ae47d9..5ef1c7c49 100644
--- a/re.c
+++ b/re.c
@@ -1168,7 +1168,7 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
 static void
 reg_enc_error(VALUE re, VALUE str)
 {
-    rb_raise(rb_eArgError,
+    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(str)));
@@ -1181,7 +1181,7 @@ rb_reg_prepare_enc(VALUE re, VALUE str, int warn)
 
     if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) {
         rb_raise(rb_eArgError,
-            "broken %s string",
+            "invalid byte sequence in %s",
             rb_enc_name(rb_enc_get(str)));
     }