diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Dec 14 02:29:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * encoding.c (rb_enc_compatible): 1st argument (typically the + receiver) would have higher priority in encoding detection. + Fri Dec 14 02:05:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (rb_io_synchronized): should check if initialized. 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 && |