yugui	2008-11-19 01:47:42 +0900 (Wed, 19 Nov 2008)

  New Revision: 20265

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

  Log:
    merges r20237 from trunk into ruby_1_9_1.
    * re.c (rb_reg_regsub): returns -1 unless ascii as well as
      rb_enc_ascget().  [ruby-dev:37097]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/re.c

Index: ruby_1_9_1/re.c
===================================================================
--- ruby_1_9_1/re.c	(revision 20264)
+++ ruby_1_9_1/re.c	(revision 20265)
@@ -3141,7 +3141,7 @@
     rb_encoding *str_enc = rb_enc_get(str);
     rb_encoding *src_enc = rb_enc_get(src);
     int acompat = rb_enc_asciicompat(str_enc);
-#define ASCGET(s,e,cl) (acompat ? (*cl=1,s[0]) : rb_enc_ascget(s, e, cl, str_enc))
+#define ASCGET(s,e,cl) (acompat ? (*cl=1,ISASCII(s[0])?s[0]:-1) : rb_enc_ascget(s, e, cl, str_enc))
 
     p = s = RSTRING_PTR(str);
     e = s + RSTRING_LEN(str);
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20264)
+++ ruby_1_9_1/ChangeLog	(revision 20265)
@@ -1,3 +1,8 @@
+Sat Nov 15 22:46:32 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* re.c (rb_reg_regsub): returns -1 unless ascii as well as
+	  rb_enc_ascget().  [ruby-dev:37097]
+
 Sat Nov 15 22:23:45 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (LDSHARED): do not suppress debug info if higher debug

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/