diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-22 06:56:44 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-22 06:56:44 +0000 |
| commit | 294c6a8692f35b5a2fc8f3db45d029c4f5971368 (patch) | |
| tree | c4f1aeda488fec63302ed3fbd9e3ee5d92b9f3f7 /encoding.c | |
| parent | 3586e244989aa3dc7ad65d6c62aead2a4b9c983c (diff) | |
| download | ruby-294c6a8692f35b5a2fc8f3db45d029c4f5971368.tar.gz ruby-294c6a8692f35b5a2fc8f3db45d029c4f5971368.tar.xz ruby-294c6a8692f35b5a2fc8f3db45d029c4f5971368.zip | |
* encoding.c (rb_enc_compatible): wrong compatibility condition.
[ruby-dev:33273]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index f429f2c81..10e3b3a44 100644 --- a/encoding.c +++ b/encoding.c @@ -669,6 +669,7 @@ rb_enc_compatible(VALUE str1, VALUE str2) if (cr1 != cr2) { /* may need to handle ENC_CODERANGE_BROKEN */ if (cr1 == ENC_CODERANGE_7BIT) return enc2; + if (cr2 == ENC_CODERANGE_7BIT) return enc1; } if (cr2 == ENC_CODERANGE_7BIT) { if (idx1 == 0) return enc2; |