merges r23694 from trunk into ruby_1_9_1.

--
* io.c (argf_each_line): should return self.  [ruby-core:23852]

* io.c (argf_each_byte, argf_each_char): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 4 deletions

diff --git a/io.c b/io.c
index 1d7b6eea81..477d1168ee 100644
--- a/io.c
+++ b/io.c
@@ -8225,11 +8225,10 @@ argf_each_line(int argc, VALUE *argv, VALUE argf)
 {
     RETURN_ENUMERATOR(argf, argc, argv);
     for (;;) {
-	if (!next_argv()) return Qnil;
+	if (!next_argv()) return argf;
 	rb_block_call(ARGF.current_file, rb_intern("each_line"), argc, argv, rb_yield, 0);
 	ARGF.next_p = 1;
     }
-    return argf;
 }
 
 static VALUE
@@ -8237,7 +8236,7 @@ argf_each_byte(VALUE argf)
 {
     RETURN_ENUMERATOR(argf, 0, 0);
     for (;;) {
-	if (!next_argv()) return Qnil;
+	if (!next_argv()) return argf;
 	rb_block_call(ARGF.current_file, rb_intern("each_byte"), 0, 0, rb_yield, 0);
 	ARGF.next_p = 1;
     }
@@ -8248,7 +8247,7 @@ argf_each_char(VALUE argf)
 {
     RETURN_ENUMERATOR(argf, 0, 0);
     for (;;) {
-	if (!next_argv()) return Qnil;
+	if (!next_argv()) return argf;
 	rb_block_call(ARGF.current_file, rb_intern("each_char"), 0, 0, rb_yield, 0);
 	ARGF.next_p = 1;
     }