diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-05 15:17:50 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-05 15:17:50 +0000 |
| commit | b346d7a69cc7e768ee4ac105e53726c87fe1ba0a (patch) | |
| tree | 7ef7bf580dcc07cbad180f587ac56510c699cc80 /encoding.c | |
| parent | 546eeb5f4bd0dfbda947a960e2ec918f8fa2ed14 (diff) | |
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
is ascii only string. [ruby-core:42354] [Bug #5968]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index c23a974671..df425f6ebf 100644 --- a/encoding.c +++ b/encoding.c @@ -812,7 +812,6 @@ rb_enc_compatible(VALUE str1, VALUE str2) if (cr2 == ENC_CODERANGE_7BIT) return enc1; } if (cr2 == ENC_CODERANGE_7BIT) { - if (idx1 == ENCINDEX_ASCII) return enc2; return enc1; } } |