* time.c (time_load): restore instance variables (if any) before

  loading from marshaled data.

* time.c (time_mdump): new marshal dumper. _dump is still
  available for compatibility.

* time.c (time_mload): new marshal loader.

* marshal.c (w_object): preserve instance variables for objects
  with marshal_dump.

* marshal.c (r_object0): restore instance variables before calling
  marshal_load.

* error.c (rb_warn_m): always return nil.


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

1 files changed, 5 insertions, 4 deletions

diff --git a/error.c b/error.c
index 4cf39d0e1f..f2a3c8ba5f 100644
--- a/error.c
+++ b/error.c
@@ -166,10 +166,11 @@ static VALUE
 rb_warn_m(self, mesg)
     VALUE self, mesg;
 {
-    if (NIL_P(ruby_verbose)) return;
-    rb_io_write(rb_stderr, mesg);
-    rb_io_write(rb_stderr, rb_default_rs);
-    return mesg;
+    if (!NIL_P(ruby_verbose)) {
+	rb_io_write(rb_stderr, mesg);
+	rb_io_write(rb_stderr, rb_default_rs);
+    }
+    return Qnil;
 }
 
 void