naruse	2009-02-09 11:35:38 +0900 (Mon, 09 Feb 2009)

  New Revision: 22146

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

  Log:
    * io.c (io_encoding_set): ignore second argument when external and
      internal are same. [ruby-dev:37939]

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22145)
+++ ChangeLog	(revision 22146)
@@ -1,3 +1,8 @@
+Mon Feb  9 11:31:09 2009  NARUSE, Yui  <naruse@r...>
+
+	* io.c (io_encoding_set): ignore second argument when external and
+	  internal are same. [ruby-dev:37939]
+
 Mon Feb  9 09:05:12 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/option.c (inspect_local_peercred): check version.
Index: io.c
===================================================================
--- io.c	(revision 22145)
+++ io.c	(revision 22146)
@@ -7024,6 +7024,10 @@
 	    }
 	    else
 		enc = rb_to_encoding(v2);
+	    if (enc == enc2) {
+		/* Special case - "-" => no transcoding */
+		enc2 = NULL;
+	    }
 	}
 	else
 	    enc = rb_to_encoding(v2);

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