yugui	2009-07-13 15:13:10 +0900 (Mon, 13 Jul 2009)

  New Revision: 24071

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

  Log:
    merges r23976 from trunk into ruby_1_9_1.
    --
    * io.c (rb_io_ext_int_to_encs): Set external encoding if
      ext==intern. [ruby-dev:38278]

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24070)
+++ ruby_1_9_1/ChangeLog	(revision 24071)
@@ -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 08:00:10 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* enum.c (enum_to_a): should propagate taint to the return value.
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 24070)
+++ ruby_1_9_1/io.c	(revision 24071)
@@ -3868,7 +3868,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 {
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24070)
+++ ruby_1_9_1/version.h	(revision 24071)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 221
+#define RUBY_PATCHLEVEL 222
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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