From cc3a7df13ba3e7329f20c9fd48b488d8b3329416 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 20 Dec 2010 13:22:59 +0000 Subject: [PATCH] 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ iseq.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7c2ecd770..92d6546ed4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 30 00:35:13 2010 Koichi Sasada + + * 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 * string.c (rb_str_inspect): fix for ascii-compatible external diff --git a/iseq.c b/iseq.c index 51891b2ce1..372a773742 100644 --- a/iseq.c +++ b/iseq.c @@ -579,7 +579,7 @@ iseq_s_compile(int argc, VALUE *argv, VALUE self) 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(""); if (NIL_P(line)) line = INT2FIX(1); diff --git a/version.h b/version.h index a30cacf2e8..ad29dbd6dd 100644 --- a/version.h +++ b/version.h @@ -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