diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 06:57:55 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 06:57:55 +0000 |
| commit | da02bd38ef6a1f60726c82c144e7e415b7097218 (patch) | |
| tree | 1397de44bb6b7c01fe4a3acb8665391ee2e26cf3 | |
| parent | a214bf6913320d76ab9a62d5d86d9a9e220613b5 (diff) | |
| download | ruby-da02bd38ef6a1f60726c82c144e7e415b7097218.tar.gz ruby-da02bd38ef6a1f60726c82c144e7e415b7097218.tar.xz ruby-da02bd38ef6a1f60726c82c144e7e415b7097218.zip | |
* 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]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 9 |
2 files changed, 9 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Thu Jan 15 15:55:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@it.aoyama.ac.jp> * LEGAL: Added information for missing/langinfo.c diff --git a/encoding.c b/encoding.c index 141796680..337942bf7 100644 --- a/encoding.c +++ b/encoding.c @@ -1050,8 +1050,7 @@ struct default_encoding { }; 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 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, } 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_enc_set_default_external(VALUE encoding) 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 @@ void rb_enc_set_default_internal(VALUE encoding) { enc_set_default_encoding(&default_internal, encoding, - "internal", ENCINDEX_UTF_8); + "internal"); } /* |