diff --git a/ChangeLog b/ChangeLog
index 382de39e56..d18efc6fc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@ Thu Feb 20 23:11:42 2003  Akinori MUSHA  <knu@iDaemons.org>
 	* instruby.rb: Convert mdoc manpages to man for systems which
 	  nroff(1) does not grok mdoc. [merged from 1.8]
 
+Tue Feb 18 21:39:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_to_io): should prefetch argv.
+
 Fri Feb 14 14:25:24 2003  akira yamada  <akira@arika.org>
 
 	* lib/uri/generic.rb, lib/uri/ldap.rb, lib/uri/mailto.ldap: all foo=()
@@ -47,6 +51,7 @@ Sat Feb  8 04:04:13 2003  Akinori MUSHA  <knu@iDaemons.org>
 	  lib/shell/error.rb, lib/shell/filter.rb: Fix typos and
 	  grammos. [approved by: keiju]
 
+>>>>>>> 1.285.2.583
 Mon Feb  3 23:46:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (argf_getline): should not increment lineno at EOF.
diff --git a/eval.c b/eval.c
index 2b019264e3..f21c5c1333 100644
--- a/eval.c
+++ b/eval.c
@@ -7891,7 +7891,9 @@ rb_thread_schedule()
 	next->gid = 0;
 	rb_thread_ready(next);
 	next->status = THREAD_TO_KILL;
-	rb_thread_save_context(curr_thread);
+	if (!rb_thread_dead(curr_thread)) {
+	    rb_thread_save_context(curr_thread);
+	}
 	rb_thread_deadlock();
     }
     next->wait_for = 0;
diff --git a/io.c b/io.c
index 6ef69e1e77..6fad35c73c 100644
--- a/io.c
+++ b/io.c
@@ -3222,6 +3222,7 @@ argf_fileno()
 static VALUE
 argf_to_io()
 {
+    next_argv();
     return current_file;
 }