ruby-changes:9986
From: matz <ko1@a...>
Date: Thu, 15 Jan 2009 15:58:13 +0900 (JST)
Subject: [ruby-changes:9986] Ruby:r21528 (trunk): * encoding.c (enc_set_default_encoding): should not treat US-ASCII
matz 2009-01-15 15:57:55 +0900 (Thu, 15 Jan 2009) New Revision: 21528 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21528 Log: * encoding.c (enc_set_default_encoding): should not treat US-ASCII special here. a patch from Yui NARUSE in [ruby-dev:37769]. [ruby-dev:37699] Modified files: trunk/ChangeLog trunk/encoding.c Index: encoding.c =================================================================== --- encoding.c (revision 21527) +++ encoding.c (revision 21528) @@ -1050,8 +1050,7 @@ }; static int -enc_set_default_encoding(struct default_encoding *def, VALUE encoding, - const char *name, int defindex) +enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name) { int overridden = Qfalse; if (def->index != -2) @@ -1066,8 +1065,6 @@ } else { def->index = rb_enc_to_index(rb_to_encoding(encoding)); - if (def->index == ENCINDEX_US_ASCII) - def->index = defindex; def->enc = 0; enc_alias_internal(name, def->index); } @@ -1118,7 +1115,7 @@ rb_raise(rb_eArgError, "default external can not be nil"); } enc_set_default_encoding(&default_external, encoding, - "external", ENCINDEX_US_ASCII); + "external"); } /* @@ -1171,7 +1168,7 @@ rb_enc_set_default_internal(VALUE encoding) { enc_set_default_encoding(&default_internal, encoding, - "internal", ENCINDEX_UTF_8); + "internal"); } /* Index: ChangeLog =================================================================== --- ChangeLog (revision 21527) +++ ChangeLog (revision 21528) @@ -1,3 +1,9 @@ +Thu Jan 15 15:55:31 2009 Yukihiro Matsumoto <matz@r...> + + * encoding.c (enc_set_default_encoding): should not treat US-ASCII + special here. a patch from Yui NARUSE in [ruby-dev:37769]. + [ruby-dev:37699] + Thu Jan 15 14:27:27 2009 Martin Duerst <duerst@i...> * LEGAL: Added information for missing/langinfo.c -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/