yugui	2009-07-12 22:56:51 +0900 (Sun, 12 Jul 2009)

  New Revision: 24039

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

  Log:
    merges r23853 from trunk into ruby_1_9_1.
    --
    * io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
      set its encoding to ASCII-8BIT.  [ruby-core:24029]

  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 24038)
+++ ruby_1_9_1/ChangeLog	(revision 24039)
@@ -1,3 +1,8 @@
+Thu Jun 25 17:58:39 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
+	  set its encoding to ASCII-8BIT.  [ruby-core:24029]
+
 Thu Jun 25 06:25:49 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* enum.c (first_i): wrong condition for no argument #first.
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 24038)
+++ ruby_1_9_1/io.c	(revision 24039)
@@ -6236,7 +6236,7 @@
 		}
 		ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn);
 	    }
-	    if (ARGF.binmode) rb_io_binmode(ARGF.current_file);
+	    if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file);
 	    if (ARGF.encs.enc) {
 		rb_io_t *fptr;
 
@@ -8279,7 +8279,8 @@
     ARGF.binmode = 1;
     next_argv();
     ARGF_FORWARD(0, 0);
-    rb_io_binmode(ARGF.current_file);
+    rb_io_ascii8bit_binmode(ARGF.current_file);
+
     return argf;
 }
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24038)
+++ ruby_1_9_1/version.h	(revision 24039)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-06-25"
-#define RUBY_PATCHLEVEL 205
+#define RUBY_PATCHLEVEL 206
 #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/