nobu	2011-05-27 22:45:12 +0900 (Fri, 27 May 2011)

  New Revision: 31748

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31748

  Log:
    * io.c (validate_enc_binmode): do not clear textmode flag if
      default.  fixed #4732

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31747)
+++ ChangeLog	(revision 31748)
@@ -1,5 +1,8 @@
-Fri May 27 22:38:54 2011  Nobuyoshi Nakada  <nobu@r...>
+Fri May 27 22:45:10 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* io.c (validate_enc_binmode): do not clear textmode flag if
+	  default.  fixed #4732
+
 	* io.c (fill_cbuf): finish reading at EOF.
 
 Fri May 27 11:31:51 2011  misfo <tedwardo2@g...>
Index: io.c
===================================================================
--- io.c	(revision 31747)
+++ io.c	(revision 31748)
@@ -4419,10 +4419,12 @@
 	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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/