From b77f3c6d2bebe7e313fdd5aba34c525d56f46680 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 13 Jul 2009 06:13:10 +0000 Subject: merges r23976 from trunk into ruby_1_9_1. -- * io.c (rb_io_ext_int_to_encs): Set external encoding if ext==intern. [ruby-dev:38278] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'io.c') diff --git a/io.c b/io.c index bb3daf0f0..7c77358d7 100644 --- a/io.c +++ b/io.c @@ -3868,7 +3868,7 @@ rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, intern = rb_default_internal_encoding(); if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) { /* No internal encoding => use external + no transcoding */ - *enc = default_ext ? NULL : ext; + *enc = (default_ext && intern != ext) ? NULL : ext; *enc2 = NULL; } else { -- cgit