From 8e57e208a743b656428e3b97a4550188bc7ba930 Mon Sep 17 00:00:00 2001
From: kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 May 2006 14:41:20 +0000
Subject: [PATCH] merge Oniguruma 4.0.3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 6 ++++++
 oniguruma.h | 2 +-
 regexec.c   | 2 +-
 version.h   | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7826e17764..59e3862d7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 10 23:40:21 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+
+	* oniguruma.h: Version 4.0.3
+
+	* regexec.c: ditto.
+
 Mon May  8 09:10:31 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
diff --git a/oniguruma.h b/oniguruma.h
index f12865fd05..9e02ecaa6e 100644
--- a/oniguruma.h
+++ b/oniguruma.h
@@ -36,7 +36,7 @@ extern "C" {
 #define ONIGURUMA
 #define ONIGURUMA_VERSION_MAJOR   4
 #define ONIGURUMA_VERSION_MINOR   0
-#define ONIGURUMA_VERSION_TEENY   2
+#define ONIGURUMA_VERSION_TEENY   3
 
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
diff --git a/regexec.c b/regexec.c
index 2aeaf142ba..de14d6d818 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3174,7 +3174,7 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
       switch (reg->sub_anchor) {
       case ANCHOR_BEGIN_LINE:
 	if (!ON_STR_BEGIN(p)) {
-	  prev = onigenc_get_prev_char_head(reg->enc, adjrange, p);
+	  prev = onigenc_get_prev_char_head(reg->enc, str, p);
 	  if (!ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end)) {
 	    p = prev;
 	    goto retry;
diff --git a/version.h b/version.h
index 53c01e2fd8..e2bdf471ae 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,14 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2006-05-09"
+#define RUBY_RELEASE_DATE "2006-05-10"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20060509
+#define RUBY_RELEASE_CODE 20060510
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2006
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];