wyhaines	2010-01-27 23:36:38 +0900 (Wed, 27 Jan 2010)

  New Revision: 26451

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

  Log:
    Backport #1818 [ruby-core:24561]; (argf_eof): go to the next file if called after ARGF.close or ARGF.skip.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/io.c

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 26450)
+++ ruby_1_8_6/ChangeLog	(revision 26451)
@@ -1,7 +1,9 @@
 Wed Jan 27 22:16:00 2010 Kirk Haines <khaines@r...>
 
-	* lib/rexml/text.rb: Backport #1806 [ruby-core:24506]; (REXML::Text.normalize): call to_s for input.
+	* io.c: Backport #1818 [ruby-core:24561]; (argf_eof): go to the next file if called after ARGF.close or ARGF.skip. 
 
+	* lib/rexml/text.rb: Backport #1806 [ruby-core:24506]; (REXML::Text.normalize): call to_s for input. r26442
+
 Tue Jan 26 3:03:00 2010 Kirk Haines <khaines@r...>
 
 	* eval.c: Backport #2039 [ruby-core:25339]; backported r24413, r24416, r24442 to fix a problem with IO#select and threads. This is the same issues as Bug #1993 [ruby-core:25114]. r26435
Index: ruby_1_8_6/io.c
===================================================================
--- ruby_1_8_6/io.c	(revision 26450)
+++ ruby_1_8_6/io.c	(revision 26451)
@@ -5430,6 +5430,7 @@
 {
     if (current_file) {
 	if (init_p == 0) return Qtrue;
+        next_argv();
 	ARGF_FORWARD(0, 0);
 	if (rb_io_eof(current_file)) {
 	    return Qtrue;

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