nobu	2009-03-05 10:24:57 +0900 (Thu, 05 Mar 2009)

  New Revision: 22774

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22774

  Log:
    * string.c (rb_str_chomp_bang): keeps 7bit coderange.

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22773)
+++ ChangeLog	(revision 22774)
@@ -1,3 +1,7 @@
+Thu Mar  5 10:24:56 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_chomp_bang): keeps 7bit coderange.
+
 Thu Mar  5 10:10:40 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED
Index: string.c
===================================================================
--- string.c	(revision 22773)
+++ string.c	(revision 22774)
@@ -6056,7 +6056,10 @@
 	 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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/