naruse	2009-07-14 01:26:08 +0900 (Tue, 14 Jul 2009)

  New Revision: 24095

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24095

  Log:
    * marshal.c (r_object0): should return real object.

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24094)
+++ ChangeLog	(revision 24095)
@@ -1,13 +1,17 @@
+Tue Jul 14 01:24:56 2009  NARUSE, Yui  <naruse@r...>
+
+	* marshal.c (r_object0): should return real object.
+
 Tue Jul 14 01:06:31 2009  Yusuke Endoh  <mame@t...>
 
- 	* enumerator.c (yielder_yield_i): use rb_proc_new instead of
- 	  rb_iterate.  [ruby-dev:38518]
- 
- 	* README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
- 	  instead.
- 
- 	* README.EXT.ja: ditto.
+	* enumerator.c (yielder_yield_i): use rb_proc_new instead of
+	  rb_iterate.  [ruby-dev:38518]
 
+	* README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
+	  instead.
+
+	* README.EXT.ja: ditto.
+
 Tue Jul 14 00:45:41 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* test/ruby/test_case.rb (TestCase#test_deoptimization):
@@ -5761,7 +5765,7 @@
 Tue Jan 13 18:19:49 2009  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
-          (also see [ruby-dev:37721])
+	  (also see [ruby-dev:37721])
 
 Tue Jan 13 17:29:02 2009  Nobuyoshi Nakada  <nobu@r...>
 
Index: marshal.c
===================================================================
--- marshal.c	(revision 24094)
+++ marshal.c	(revision 24095)
@@ -1406,7 +1406,7 @@
 	    }
 	    str = r_entry(rb_reg_new_str(str, options), arg);
 	    rb_copy_generic_ivar(str, v);
-	    v = r_leave(v, arg);
+	    v = r_leave(str, arg);
 	}
 	break;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/