diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | string.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Mar 5 10:24:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_chomp_bang): keeps 7bit coderange. + Thu Mar 5 10:10:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED @@ -6056,7 +6056,10 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) { if (rb_enc_left_char_head(p, pp, e, enc) != pp) return Qnil; - rb_str_modify(str); + str_modify_keep_cr(str); + if (ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) { + ENC_CODERANGE_CLEAR(str); + } STR_SET_LEN(str, RSTRING_LEN(str) - rslen); RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0'; return str; |