From cb3a1c5f37c556b3f85298deeed1ed15281c0bc9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 4 Sep 2009 01:05:10 +0000 Subject: 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]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 1 + version.h | 10 +++++----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91c61a95c8..d59f4ce62b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 4 10:03:22 2009 Nobuyoshi Nakada + + * 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 * lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add diff --git a/io.c b/io.c index 7151041dd9..a5b0ef527a 100644 --- a/io.c +++ b/io.c @@ -5546,6 +5546,7 @@ argf_eof() { if (current_file) { if (init_p == 0) return Qtrue; + next_argv(); ARGF_FORWARD(0, 0); if (rb_io_eof(current_file)) { return Qtrue; diff --git a/version.h b/version.h index b11cab1e06..a7a440f20e 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit v1.2.3