merges r24197 from trunk into ruby_1_9_1.

--
use rb_enc_get to get the encoding of a Regexp object.

* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 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().
diff --git a/re.c b/re.c
index 699e90ab4d..f1fa5a4350 100644
--- a/re.c
+++ b/re.c
@@ -1171,7 +1171,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)));
 }
 
diff --git a/version.h b/version.h
index 310438c913..08c8212e68 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 246
+#define RUBY_PATCHLEVEL 247
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1