summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-20 09:23:53 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-20 09:23:53 (GMT)
commit82ea308dcf767a779c7b3efd930f8d13ea50a5aa (patch)
tree20925c753a77b76e43f8580cdbccbb76ab3387dc
parent407d2fb2980e338dc25903800fd56080ad5b7c6f (diff)
merge revision(s) 17483:ruby_1_8_5
* string.c (rb_str_buf_append): should infect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17484 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 a567c43..ecd342e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 18:23:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_buf_append): should infect.
+
Fri Jun 20 15:51:18 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 4f27d43..f0cea48 100644
--- a/string.c
+++ b/string.c
@@ -775,7 +775,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 9d57444..c0b484a 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-20"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080620
-#define RUBY_PATCHLEVEL 230
+#define RUBY_PATCHLEVEL 231
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8