naruse	2009-07-07 10:15:32 +0900 (Tue, 07 Jul 2009)

  New Revision: 23976

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

  Log:
    * io.c (rb_io_ext_int_to_encs): Set external encoding if
      ext==intern. [ruby-dev:38278]

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23975)
+++ ChangeLog	(revision 23976)
@@ -1,3 +1,8 @@
+Tue Jul  7 10:12:37 2009  NARUSE, Yui  <naruse@r...>
+
+	* io.c (rb_io_ext_int_to_encs): Set external encoding if
+	  ext==intern. [ruby-dev:38278]
+
 Mon Jul  6 09:31:50 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (make_curry_proc): should propagate lambda-ness.
Index: io.c
===================================================================
--- io.c	(revision 23975)
+++ io.c	(revision 23976)
@@ -4101,7 +4101,7 @@
 	intern = rb_default_internal_encoding();
     if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) {
 	/* No internal encoding => use external + no transcoding */
-	*enc = default_ext ? NULL : ext;
+	*enc = (default_ext && intern != ext) ? NULL : ext;
 	*enc2 = NULL;
     }
     else {

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