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

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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 989d1b0eb0..8111683fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 17 16:04:13 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* regparse.c (parse_char_class): fixes a wrong merge r25531.
+
 Tue Nov 17 16:01:02 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* insns.def (opt_case_dispatch): need cast.
diff --git a/regparse.c b/regparse.c
index 35b6c33e77..1fc0459fa6 100644
--- a/regparse.c
+++ b/regparse.c
@@ -4406,7 +4406,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
 	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;
diff --git a/version.h b/version.h
index 77b761407f..a04435f477 100644
--- a/version.h
+++ b/version.h
@@ -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