summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-03 12:23:54 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-03 12:23:54 +0000
commit909a92ea6ddf476411c580c8e075dfd078a59ddc (patch)
tree817bbd7253704d2067e8cde5b69ad24d6e2be18f /io.c
parent6cdc9b6097ea907cdaf2f95c9e34f29676166046 (diff)
merges r32000 from trunk into ruby_1_9_2.
-- * io.c (io_getc): should be 7bit if ascii. fixes #4557 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io.c b/io.c
index dee458784a..065b165906 100644
--- a/io.c
+++ b/io.c
@@ -2851,7 +2851,7 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
}
else {
io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
- cr = ENC_CODERANGE_VALID;
+ cr = ISASCII(r) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
}
str = io_enc_str(str, fptr);
ENC_CODERANGE_SET(str, cr);