merges r22608 from trunk into ruby_1_9_1.

--
* string.c (rb_str_chomp_bang): coderange may change.
  [ruby-core:22414]

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

1 files changed, 1 insertions, 1 deletions

diff --git a/string.c b/string.c
index 452bc6ad0..35991bb7e 100644
--- a/string.c
+++ b/string.c
@@ -5947,7 +5947,7 @@ 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;
-	str_modify_keep_cr(str);
+	rb_str_modify(str);
 	STR_SET_LEN(str, RSTRING_LEN(str) - rslen);
 	RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';
 	return str;