From 1b79efbb3945e59fb784a0ca23587e8ec5644777 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 8 Nov 2011 05:50:43 +0000
Subject: [PATCH] * ChangeLog: commit miss of r33662.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 85f115e93f..7b5eb8681a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,26 @@ Tue Nov  8 11:01:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 	* ext/pty/pty.c (get_device_once): FreeBSD's posix_openpt doesn't
 	  support O_CLOEXEC and fails if specified.
 
+Tue Nov  8 02:36:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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.
+
 Mon Nov  7 22:03:47 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/gdbm/gdbm.c (fgdbm_initialize): set close-on-exec flag.