diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:40:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:40:06 +0000 |
| commit | e1ccf2699d1789f46c33da217a8aed61847727f5 (patch) | |
| tree | 73e3eaa67c5c8e6c405fe81b0bf6ea79ca723d77 /encoding.c | |
| parent | 2f2497ee534fe7cdc5ffab2bda5e7446b9f42b76 (diff) | |
merges r21528 from trunk into ruby_1_9_1.
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/encoding.c b/encoding.c index 141796680e..337942bf74 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"); } /* |