usa	2011-11-16 11:36:08 +0900 (Wed, 16 Nov 2011)

  New Revision: 33770

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

  Log:
    * io.c (argf_next_argv): wrong timing of setting ecflags.
      fixed the failure of TestArgf#test_textmode introduced at r33662.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33769)
+++ ChangeLog	(revision 33770)
@@ -1,3 +1,8 @@
+Wed Nov 16 11:34:20 2011  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (argf_next_argv): wrong timing of setting ecflags.
+	  fixed the failure of TestArgf#test_textmode introduced at r33662.
+
 Wed Nov 16 10:45:00 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/-test-/num2int/num2int.c: remove an unnecessary and wrong decl
Index: io.c
===================================================================
--- io.c	(revision 33769)
+++ io.c	(revision 33770)
@@ -7137,9 +7137,6 @@
 		fmode = FMODE_READABLE;
 		if (!ARGF.binmode) {
 		    fmode |= DEFAULT_TEXTMODE;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
-		    fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
-#endif
 		}
 		ARGF.current_file = prep_io(fr, fmode, rb_cFile, fn);
 		if (!NIL_P(write_io)) {
@@ -7156,6 +7153,9 @@
 		fptr->encs.ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK;
 		if (!ARGF.binmode) {
 		    fptr->encs.ecflags |= ECONV_DEFAULT_NEWLINE_DECORATOR;
+#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
+		    fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
+#endif
 		}
 	    }
 	    ARGF.next_p = 0;

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