* string.c (rb_str_append): always set encoding, and coderange

  cache bits.

* include/ruby/encoding.h (ENC_CODERANGE_SET): fixed a bug not to
  set chache bits.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/string.c b/string.c
index c70dc1644..5fbc4e713 100644
--- a/string.c
+++ b/string.c
@@ -995,9 +995,12 @@ VALUE
 rb_str_append(VALUE str, VALUE str2)
 {
     rb_encoding *enc;
+    int cr, cr2;
 
     StringValue(str2);
     enc = rb_enc_check(str, str2);
+    cr = ENC_CODERANGE(str);
+    if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2;
     rb_str_modify(str);
     if (RSTRING_LEN(str2) > 0) {
 	if (STR_ASSOC_P(str)) {
@@ -1008,11 +1011,12 @@ rb_str_append(VALUE str, VALUE str2)
 	    RSTRING(str)->as.heap.len = len;
 	}
 	else {
-	    return rb_str_buf_append(str, str2);
+	    rb_str_buf_append(str, str2);
 	}
     }
     OBJ_INFECT(str, str2);
     rb_enc_associate(str, enc);
+    ENC_CODERANGE_SET(str, cr);
     return str;
 }