summaryrefslogtreecommitdiff
path: root/encoding.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-13 17:30:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-13 17:30:54 +0000
commite0334fb250d6d2cd34de379743551864ace9c496 (patch)
treecd0adf0f4ef26f1d329c0d569b52bdac384e7f0b /encoding.c
parentc3b5279d4953de9bf046920abe45bf83097b3299 (diff)
* encoding.c (rb_enc_compatible): 1st argument (typically the
receiver) would have higher priority in encoding detection. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c
index f297983cc2..324ff956e7 100644
--- a/encoding.c
+++ b/encoding.c
@@ -399,7 +399,7 @@ rb_enc_compatible(VALUE str1, VALUE str2)
}
if (cr2 == ENC_CODERANGE_7BIT) {
if (idx1 == 0) return rb_enc_from_index(idx2);
- if (idx2 == 0) return rb_enc_from_index(idx1);
+ return rb_enc_from_index(idx1);
}
}
if (cr1 == ENC_CODERANGE_7BIT &&