yugui	2009-07-27 00:32:11 +0900 (Mon, 27 Jul 2009)

  New Revision: 24289

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24289

  Log:
    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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/re.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24288)
+++ ruby_1_9_1/ChangeLog	(revision 24289)
@@ -1,3 +1,10 @@
+Sat Jul 18 23:44:59 2009  NARUSE, Yui  <naruse@r...>
+
+	* 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@a...>
 
 	* ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().
Index: ruby_1_9_1/re.c
===================================================================
--- ruby_1_9_1/re.c	(revision 24288)
+++ ruby_1_9_1/re.c	(revision 24289)
@@ -1171,7 +1171,7 @@
 {
     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)));
 }
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24288)
+++ ruby_1_9_1/version.h	(revision 24289)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/