summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-20 09:28:35 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-20 09:28:35 +0000
commitb5eb973b1a5048b940bf6cb97537aff6c89672e3 (patch)
tree8bbdcf1254e5c87e9696d83c4eb893c2afa842ee
parent855e79f3de9dea98f9484181c9ffe47dbcba2807 (diff)
merge revision(s) 17483:
* string.c (rb_str_buf_append): should infect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c4
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4253640..74d6feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 18:25:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_buf_append): should infect.
+
Fri Jun 20 16:33:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
diff --git a/string.c b/string.c
index 1f2db9b..2d40ccf 100644
--- a/string.c
+++ b/string.c
@@ -793,7 +793,9 @@ VALUE
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
diff --git a/version.h b/version.h
index 0373739..9a97082 100644
--- a/version.h
+++ b/version.h
@@ -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