diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-31 02:35:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-31 02:35:41 +0000 |
| commit | b1c07ee240f4fad7f498bd7910be027d47e4894b (patch) | |
| tree | d678061cfd8cc8cd1d7057db90ad950d9e2ade12 /encoding.c | |
| parent | 04e94c6ec85f15eb50296288d4d7b2b2cc58a2a5 (diff) | |
* encoding.c (rb_enc_set_default_internal): no alias "internal" if
defalt internal is not set. [ruby-dev:37000]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/encoding.c b/encoding.c index e9fcbfcb3e..7b7d301133 100644 --- a/encoding.c +++ b/encoding.c @@ -1101,8 +1101,13 @@ rb_enc_set_default_internal(VALUE encoding) if (default_internal_index != -2) /* Already set */ return; - default_internal_index = encoding == Qnil ? - -1 :rb_enc_to_index(rb_to_encoding(encoding)); + if (NIL_P(encoding)) { + default_internal_index = -1; + default_internal = 0; + return; + } + + default_internal_index = rb_enc_to_index(rb_to_encoding(encoding)); /* Convert US-ASCII => UTF-8 */ if (default_internal_index == rb_usascii_encindex()) default_internal_index = rb_utf8_encindex(); |