* eval.c (rb_call_super): propagate previous block if a block is

  given.  [ruby-talk:77577]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e228b291b..df9d50a74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  1 13:45:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call_super): propagate previous block if a block is
+	  given.  [ruby-talk:77577]
+
 Fri Aug  1 09:54:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (BEGIN_CALLARGS): should not always  reset ruby_iter,
diff --git a/eval.c b/eval.c
index 1c4436c7c..fd28c166f 100644
--- a/eval.c
+++ b/eval.c
@@ -5235,7 +5235,7 @@ rb_call_super(argc, argv)
 	klass = k;
     }
 
-    PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT);
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
     result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
     POP_ITER();