diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-07 01:15:32 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-07 01:15:32 +0000 |
| commit | 86b4a27eb0175af873373909b78e06ec4c0cd787 (patch) | |
| tree | 9017b544c1965ff6302f459a61ae08c54d3e89a4 /io.c | |
| parent | e0d0337bdc49d8fbda6eb4d8e4f4eb2aa8e1ddda (diff) | |
| download | ruby-86b4a27eb0175af873373909b78e06ec4c0cd787.tar.gz ruby-86b4a27eb0175af873373909b78e06ec4c0cd787.tar.xz ruby-86b4a27eb0175af873373909b78e06ec4c0cd787.zip | |
* 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/trunk@23976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4101,7 +4101,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 { |
