From 093ade0eb8229673f4985a3c9a1eadc191f9e533 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 10 Feb 2012 18:21:01 +0000 Subject: merge revision(s) 33662,33666,33770: [Backport #5793] ------------------------------------------------------------------------ r33662 | usa | 2011-11-08 02:48:11 +0900 (Tue, 08 Nov 2011) | 18 lines * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK, ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro. * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv): set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO if the flag is available. * io.c (make_writeconv): drop decorators for reading. * io.c (make_readconv): drop decorators for writing. * io.c (do_writeconv): existing writeconv is not the condition to raise ArgumentError. should check textmode or not. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above changes. ------------------------------------------------------------------------ * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK, ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro. * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv): set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO if the flag is available. * io.c (make_writeconv): drop decorators for reading. * io.c (make_readconv): drop decorators for writing. * io.c (do_writeconv): existing writeconv is not the condition to raise ArgumentError. should check textmode or not. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above changes. * io.c (argf_next_argv): wrong timing of setting ecflags. fixed the failure of TestArgf#test_textmode introduced at r33662. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 467b15e196..aaee25a28a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,33 @@ +Sat Feb 11 03:20:22 2012 NAKAMURA Usaku + + * io.c (argf_next_argv): wrong timing of setting ecflags. + fixed the failure of TestArgf#test_textmode introduced at r33662. + Sat Feb 11 03:19:45 2012 NAKAMURA Usaku * test/ruby/test_io_m17n.rb (TestIO_M17N#test_default_stdout_stderr_mode): new test for r33627-33629. see [backport #5565] +Sat Feb 11 03:20:22 2012 NAKAMURA Usaku + + * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK, + ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro. + + * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv): + set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO + if the flag is available. + + * io.c (make_writeconv): drop decorators for reading. + + * io.c (make_readconv): drop decorators for writing. + + * io.c (do_writeconv): existing writeconv is not the condition to raise + ArgumentError. should check textmode or not. + + * test/ruby/test_io_m17n.rb + (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above + changes. + Sat Feb 11 03:19:45 2012 NAKAMURA Usaku -- cgit v1.2.3