diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 19:29:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 19:29:01 +0000 |
commit | 06d87bfeac364cc77f3ef09a477aa12957a51f0f (patch) | |
tree | 8a3ef3b33264ca16fd9ce937f78218f8a97570a1 /io.c | |
parent | 1ed3297c8fb704fd0d71ddedb22eb1a823291e2d (diff) | |
download | ruby-06d87bfeac364cc77f3ef09a477aa12957a51f0f.tar.gz ruby-06d87bfeac364cc77f3ef09a477aa12957a51f0f.tar.xz ruby-06d87bfeac364cc77f3ef09a477aa12957a51f0f.zip |
* io.c (io_enc_str): should preserve default_external encoding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1316,9 +1316,9 @@ io_enc_str(VALUE str, rb_io_t *fptr) rb_enc_from_encoding(fptr->enc), rb_enc_from_encoding(fptr->enc2)); } - else if (fptr->enc) { + else { /* just one encoding, so associate it with the string */ - rb_enc_associate(str, fptr->enc); + rb_enc_associate(str, io_read_encoding(fptr)); } return str; } |