shyouhei	2009-01-28 20:59:58 +0900 (Wed, 28 Jan 2009)

  New Revision: 21851

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

  Log:
    merge revision(s) 19653:
    * marshal.c (marshal_dump): fixed for check_dump_arg.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/marshal.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21850)
+++ ruby_1_8_6/ChangeLog	(revision 21851)
@@ -1,3 +1,7 @@
+Wed Jan 28 20:53:27 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* marshal.c (marshal_dump): fixed for check_dump_arg.
+
 Tue Jan 27 17:29:05 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* marshal.c (marshal_dump): initializes dump_arg before any funcall.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21850)
+++ ruby_1_8_6/version.h	(revision 21851)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-27"
+#define RUBY_RELEASE_DATE "2009-01-28"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090127
-#define RUBY_PATCHLEVEL 312
+#define RUBY_RELEASE_CODE 20090128
+#define RUBY_PATCHLEVEL 313
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/marshal.c
===================================================================
--- ruby_1_8_6/marshal.c	(revision 21850)
+++ ruby_1_8_6/marshal.c	(revision 21851)
@@ -790,7 +790,7 @@
 	arg.dest = port;
 	if (rb_respond_to(port, s_binmode)) {
 	    rb_funcall2(port, s_binmode, 0, 0);
-	    check_dump_arg(&arg, s_dump_data);
+	    check_dump_arg(&arg, s_binmode);
 	}
     }
     else {

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