yugui	2009-11-17 16:05:30 +0900 (Tue, 17 Nov 2009)

  New Revision: 25816

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

  Log:
    * regparse.c (parse_char_class): fixes a wrong merge r25531.

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

Index: ruby_1_9_1/regparse.c
===================================================================
--- ruby_1_9_1/regparse.c	(revision 25815)
+++ ruby_1_9_1/regparse.c	(revision 25816)
@@ -4406,7 +4406,7 @@
 	r = parse_char_class(&anode, tok, &p, end, env);
 	if (r == 0) {
 	  acc = NCCLASS(anode);
-	  r = or_cclass(cc, acc, env);
+	  r = or_cclass(cc, acc, env->enc);
 	}
 	onig_node_free(anode);
 	if (r != 0) goto err;
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25815)
+++ ruby_1_9_1/ChangeLog	(revision 25816)
@@ -1,3 +1,7 @@
+Tue Nov 17 16:04:13 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* regparse.c (parse_char_class): fixes a wrong merge r25531.
+
 Tue Nov 17 16:01:02 2009  NAKAMURA Usaku  <usa@r...>
 
 	* insns.def (opt_case_dispatch): need cast.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25815)
+++ ruby_1_9_1/version.h	(revision 25816)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 338
+#define RUBY_PATCHLEVEL 339
 #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/