* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.

* ext/stringio/stringio.c (strio_getline): should not set $_ here.

* io.c (argf_to_s): argf.to_s returns "ARGF".

* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
  obsolete.

* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
  $stderr not to be instance of IO.

* io.c (rb_f_readline): forward method to current_file. gets,
  readline, readlines, getc, readchar, tell, seek, pos=, rewind,
  fileno, to_io, eof, each_line, each_byte, binmode, and closed?
  as well.

* io.c (argf_forward): utility function to forward method to
  current_file.


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

1 files changed, 8 insertions, 8 deletions

diff --git a/error.c b/error.c
index 901d0f0273..bcc36d213a 100644
--- a/error.c
+++ b/error.c
@@ -113,8 +113,8 @@ warn_print(fmt, args)
     char buf[BUFSIZ];
 
     err_snprintf(buf, BUFSIZ, fmt, args);
-    rb_write_deferr(buf);
-    rb_write_deferr("\n");
+    rb_write_error(buf);
+    rb_write_error("\n");
 }
 
 void
@@ -162,8 +162,8 @@ static VALUE
 rb_warn_m(self, mesg)
     VALUE self, mesg;
 {
-    rb_io_write(rb_deferr, mesg);
-    rb_io_write(rb_deferr, rb_default_rs);
+    rb_io_write(rb_stderr, mesg);
+    rb_io_write(rb_stderr, rb_default_rs);
     return mesg;
 }
 
@@ -186,8 +186,8 @@ rb_bug(fmt, va_alist)
     warn_print(buf, args);
     va_end(args);
     snprintf(buf, BUFSIZ, "ruby %s (%s) [%s]\n", RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PLATFORM);
-    rb_write_deferr(buf);
-    rb_write_deferr("\n");
+    rb_write_error(buf);
+    rb_write_error("\n");
     abort();
 }
 
@@ -1200,7 +1200,7 @@ err_append(s)
 	}
     }
     else {
-	rb_write_deferr(s);
-	rb_write_deferr("\n");
+	rb_write_error(s);
+	rb_write_error("\n");
     }
 }