From 72c0d800b47324cebc95e1ddc5effb8c5e8323a6 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Jul 2009 14:45:43 +0000
Subject: merges r23916 from trunk into ruby_1_9_1. -- * re.c (reg_match_pos):
 adjust offset based on characters, not   bytes.  [ruby-dev:38722]

* string.c (rb_str_offset): new function.

* string.c (rb_str_index_m): no call to rb_reg_adjust_startpos().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 960f0e097a..11d7ed6f69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun 30 17:44:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (reg_match_pos): adjust offset based on characters, not
+	  bytes.  [ruby-dev:38722]
+
+	* string.c (rb_str_offset): new function.
+
+	* string.c (rb_str_index_m): no call to rb_reg_adjust_startpos().
+
 Tue Jun 30 16:48:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* tool/compile_prelude.rb: use US-ASCII name.
-- 
cgit v1.2.3