merges r23155 and r23158 from trunk into ruby_1_9_1.

--
* string.c (rb_str_chop_bang): reset coderange. [ruby-core:23155]
--
* test/ruby/test_string.rb (test_chop, test_chop!): tests for [ruby-core:23155].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/string.c b/string.c
index 11aaa3eb52..8c919ec100 100644
--- a/string.c
+++ b/string.c
@@ -5811,7 +5811,7 @@ rb_str_chop_bang(VALUE str)
 {
     if (RSTRING_LEN(str) > 0) {
 	long len;
-	str_modify_keep_cr(str);
+	rb_str_modify(str);
 	len = chopped_length(str);
 	STR_SET_LEN(str, len);
 	RSTRING_PTR(str)[len] = '\0';