yugui	2009-02-22 18:48:57 +0900 (Sun, 22 Feb 2009)

  New Revision: 22523

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

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

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22522)
+++ ruby_1_9_1/ChangeLog	(revision 22523)
@@ -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]
+
 Sun Feb  8 23:28:05 2009  Yusuke Endoh  <mame@t...>
 
 	* include/ruby/st.h, st.c: order entries by a linked list instead of
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 22522)
+++ ruby_1_9_1/io.c	(revision 22523)
@@ -6969,6 +6969,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/