merges r29074 from trunk into ruby_1_9_2.

--
* re.c (rb_reg_search): fix: 4th argument should be regexp
  object. patched by shintaro kuwamoto [ruby-dev:41667] #3459

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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b3849b7616..f8ea46e277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 23 12:28:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_search): fix: 4th argument should be regexp
+	  object. patched by shintaro kuwamoto [ruby-dev:41667] #3459
+
 Mon Aug 23 02:23:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* util.c (ruby_strtod): make sure to have digit-sequence after 'p'
diff --git a/re.c b/re.c
index 8484c68ee2..298d1d9554 100644
--- a/re.c
+++ b/re.c
@@ -1395,7 +1395,7 @@ rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
 	else {
 	    onig_errmsg_buffer err = "";
 	    onig_error_code_to_str((UChar*)err, (int)result);
-	    rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, 0);
+	    rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, re);
 	}
     }
 
diff --git a/version.h b/version.h
index 35120a1090..21b3487206 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-09-29"
-#define RUBY_PATCHLEVEL 7
+#define RUBY_PATCHLEVEL 8
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9