diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-04 01:05:10 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-04 01:05:10 +0000 |
commit | cb3a1c5f37c556b3f85298deeed1ed15281c0bc9 (patch) | |
tree | 002823c09f67d148aa154e4777b4a5fa3cfdee0d | |
parent | 4ed5e8bb9f9b231fd6a815be664e4fec5e26f09a (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 1 | ||||
-rw-r--r-- | version.h | 10 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Fri Sep 4 10:03:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add @@ -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; @@ -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[]; |