diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,7 @@ -Fri May 27 22:38:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri May 27 22:45:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (validate_enc_binmode): do not clear textmode flag if + default. fixed #4732 * io.c (fill_cbuf): finish reading at EOF. @@ -4419,10 +4419,12 @@ validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *e fmode |= DEFAULT_TEXTMODE; *fmode_p = fmode; } +#if !DEFAULT_TEXTMODE else if (!(ecflags & ECONV_NEWLINE_DECORATOR_MASK)) { fmode &= ~FMODE_TEXTMODE; *fmode_p = fmode; } +#endif } static void |