shyouhei	2008-06-20 18:28:35 +0900 (Fri, 20 Jun 2008)

  New Revision: 17488

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/string.c
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17483:
    * string.c (rb_str_buf_append): should infect.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17488&r2=17487&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/string.c?r1=17488&r2=17487&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17488&r2=17487&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17487)
+++ ruby_1_8_7/ChangeLog	(revision 17488)
@@ -1,3 +1,7 @@
+Fri Jun 20 18:25:18 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_buf_append): should infect.
+
 Fri Jun 20 16:33:09 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17487)
+++ ruby_1_8_7/version.h	(revision 17488)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-20"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080620
-#define RUBY_PATCHLEVEL 21
+#define RUBY_PATCHLEVEL 22
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/string.c
===================================================================
--- ruby_1_8_7/string.c	(revision 17487)
+++ ruby_1_8_7/string.c	(revision 17488)
@@ -793,7 +793,9 @@
 rb_str_buf_append(str, str2)
     VALUE str, str2;
 {
-    return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+    str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+    OBJ_INFECT(str, str2);
+    return str;
 }
 
 VALUE

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