0
@@ -1,3 +1,8 @@
0
+Thu Feb 21 14:47:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
0
+
0
+	* io.c (argf_set_encoding): uses current_file after check for next
0
+	  input.
0
+
0
 Thu Feb 21 11:10:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
0
 
0
   * string.c: replace rb_enc_copy by rb_enc_cr_str_copy or

0
@@ -69,3 +69,7 @@ assert_equal 'ok', %q{
0
   File.unlink(tmpname)
0
   :ok
0
 }
0
+
0
+assert_normal_exit %q{
0
+  ARGF.set_encoding "foo"
0
+}

0
@@ -57,7 +57,3 @@ assert_normal_exit %q{
0
 assert_normal_exit %q{
0
   "".center(1, "\x80".force_encoding("utf-8"))
0
 }, '[ruby-dev:33807]'
0
-
0
-assert_normal_exit %q{
0
-  ARGF.set_encoding "foo"
0
-}

0
@@ -6103,8 +6103,11 @@ argf_set_encoding(int argc, VALUE *argv, VALUE io)
0
 {
0
     rb_io_t *fptr;
0
 
0
+    if (next_argv()) {
0
+	rb_raise(rb_eArgError, "no stream to set encoding");
0
+    }
0
     rb_io_set_encoding(argc, argv, current_file);
0
-    GetOpenFile(io, fptr);
0
+    GetOpenFile(current_file, fptr);
0
     argf_enc = fptr->enc;
0
     argf_enc2 = fptr->enc2;
0
     return io;