merges r23970 from trunk into ruby_1_9_1.

--
* proc.c (make_curry_proc): should propagate lambda-ness.
  [ruby-core:24127]

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

1 files changed, 10 insertions, 2 deletions

diff --git a/proc.c b/proc.c
index 300e18d90a..ed44512ca1 100644
--- a/proc.c
+++ b/proc.c
@@ -1694,9 +1694,17 @@ static VALUE
 make_curry_proc(VALUE proc, VALUE passed, VALUE arity)
 {
     VALUE args = rb_ary_new3(3, proc, passed, arity);
+    rb_proc_t *procp;
+    int is_lambda;
+
+    GetProcPtr(proc, procp);
+    is_lambda = procp->is_lambda;
     rb_ary_freeze(passed);
     rb_ary_freeze(args);
-    return rb_proc_new(curry, args);
+    proc = rb_proc_new(curry, args);
+    GetProcPtr(proc, procp);
+    procp->is_lambda = is_lambda;
+    return proc;
 }
 
 static VALUE
@@ -1710,7 +1718,7 @@ curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
     passed = rb_ary_plus(passed, rb_ary_new4(argc, argv));
     rb_ary_freeze(passed);
 
-    if(RARRAY_LEN(passed) < FIX2INT(arity)) {
+    if (RARRAY_LEN(passed) < FIX2INT(arity)) {
 	if (!NIL_P(passed_proc)) {
 	    rb_warn("given block not used");
 	}