Skip to content
This repository
Browse code

merge revision(s) 17483:

	* string.c (rb_str_buf_append): should infect.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_5@17484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 4df809b0a7370c1f99213be84d6374bde8f38507 1 parent 5346f1b
Urabe, Shyouhei authored June 20, 2008
4  ChangeLog
... ...
@@ -1,3 +1,7 @@
  1
+Fri Jun 20 18:23:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
  2
+
  3
+	* string.c (rb_str_buf_append): should infect.
  4
+
1 5
 Fri Jun 20 15:51:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
2 6
 
3 7
 	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
4  string.c
@@ -775,7 +775,9 @@ VALUE
775 775
 rb_str_buf_append(str, str2)
776 776
     VALUE str, str2;
777 777
 {
778  
-    return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
  778
+    str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
  779
+    OBJ_INFECT(str, str2);
  780
+    return str;
779 781
 }
780 782
 
781 783
 VALUE
2  version.h
@@ -2,7 +2,7 @@
2 2
 #define RUBY_RELEASE_DATE "2008-06-20"
3 3
 #define RUBY_VERSION_CODE 185
4 4
 #define RUBY_RELEASE_CODE 20080620
5  
-#define RUBY_PATCHLEVEL 230
  5
+#define RUBY_PATCHLEVEL 231
6 6
 
7 7
 #define RUBY_VERSION_MAJOR 1
8 8
 #define RUBY_VERSION_MINOR 8

0 notes on commit 4df809b

Please sign in to comment.
Something went wrong with that request. Please try again.