matz	2008-01-31 02:23:27 +0900 (Thu, 31 Jan 2008)

  New Revision: 15350

  Modified files:
    trunk/ChangeLog
    trunk/io.c

  Log:
    * io.c (open_key_args): allow encoding key to take two encoding
      names.  a patch from <rubikitch AT ruby-lang.org>.  [ruby-dev:33540]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15350&r2=15349&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=15350&r2=15349&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15349)
+++ ChangeLog	(revision 15350)
@@ -1,3 +1,8 @@
+Thu Jan 31 02:22:04 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (open_key_args): allow encoding key to take two encoding
+	  names.  a patch from <rubikitch AT ruby-lang.org>.  [ruby-dev:33540]
+
 Thu Jan 31 02:15:49 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (dsym): allow empty symbols.  [ruby-core:15248]
Index: io.c
===================================================================
--- io.c	(revision 15349)
+++ io.c	(revision 15350)
@@ -5853,7 +5853,7 @@
 
 	arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r");
 	GetOpenFile(arg->io, fptr);
-	fptr->enc = rb_to_encoding(v);
+        mode_enc(fptr, StringValueCStr(v));
 	return;
     }
 }

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