From e0334fb250d6d2cd34de379743551864ace9c496 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 13 Dec 2007 17:30:54 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ encoding.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9c238d4e58..18f6a2cb25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 14 02:29:32 2007 Yukihiro Matsumoto + + * 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 * 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 &&