yugui	2010-12-20 22:22:59 +0900 (Mon, 20 Dec 2010)

  New Revision: 30264

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

  Log:
    merges r29630 from trunk into ruby_1_9_2.
    --
    * iseq.c (iseq_s_compile): fix optional argument.
      a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/iseq.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30263)
+++ ruby_1_9_2/ChangeLog	(revision 30264)
@@ -1,3 +1,8 @@
+Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@a...>
+
+	* iseq.c (iseq_s_compile): fix optional argument.
+	  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
+
 Mon Nov 22 21:30:57 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_inspect): fix for ascii-compatible external
Index: ruby_1_9_2/iseq.c
===================================================================
--- ruby_1_9_2/iseq.c	(revision 30263)
+++ ruby_1_9_2/iseq.c	(revision 30264)
@@ -579,7 +579,7 @@
 
     rb_secure(1);
 
-    rb_scan_args(argc, argv, "13", &src, &file, &path, &line, &opt);
+    rb_scan_args(argc, argv, "14", &src, &file, &path, &line, &opt);
     if (NIL_P(file)) file = rb_str_new2("<compiled>");
     if (NIL_P(line)) line = INT2FIX(1);
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30263)
+++ ruby_1_9_2/version.h	(revision 30264)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 104
+#define RUBY_PATCHLEVEL 105
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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