shyouhei	2009-09-04 10:05:10 +0900 (Fri, 04 Sep 2009)

  New Revision: 24747

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

  Log:
    merge revision(s) 24283:24296:
    * io.c (argf_eof): go to the next file if called after ARGF.close
      or ARGF.skip.  a patch from Mike Kasick at [ruby-core:24561].

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/io.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24746)
+++ ruby_1_8_7/ChangeLog	(revision 24747)
@@ -1,3 +1,8 @@
+Fri Sep  4 10:03:22 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (argf_eof): go to the next file if called after ARGF.close
+	  or ARGF.skip.  a patch from Mike Kasick at [ruby-core:24561].
+
 Sun Aug  9 17:43:44 2009  Keiju Ishitsuka  <keiju@r...>
 
 	* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24746)
+++ ruby_1_8_7/version.h	(revision 24747)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-08-09"
+#define RUBY_RELEASE_DATE "2009-09-04"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090809
-#define RUBY_PATCHLEVEL 196
+#define RUBY_RELEASE_CODE 20090904
+#define RUBY_PATCHLEVEL 197
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_MONTH 9
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/io.c
===================================================================
--- ruby_1_8_7/io.c	(revision 24746)
+++ ruby_1_8_7/io.c	(revision 24747)
@@ -5546,6 +5546,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/