diff --git a/ChangeLog b/ChangeLog
index fe8d63386c..9648b5bb3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  5 09:02:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
+	  is a set of bit flags.  [ruby-dev:23859]
+
 Mon Jul  5 01:20:17  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
@@ -94,7 +99,7 @@ Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
 	    Model.  it caused error.
-	  
+
 	  * add WSDL simpleType support to restrict lexical value space.
 
 Sat Jul  3 17:19:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
diff --git a/eval.c b/eval.c
index c81cd19305..8dfd682494 100644
--- a/eval.c
+++ b/eval.c
@@ -11470,7 +11470,7 @@ rb_thread_yield(arg, th)
     rb_dvar_push('~', Qnil);
     ruby_block->dyna_vars = ruby_dyna_vars;
 
-    return rb_yield_0(arg, 0, 0, Qtrue, Qtrue);
+    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
 }
 
 /*
@@ -12513,7 +12513,7 @@ rb_f_catch(dmy, tag)
     tag = ID2SYM(rb_to_id(tag));
     PUSH_TAG(tag);
     if ((state = EXEC_TAG()) == 0) {
-	val = rb_yield_0(tag, 0, 0, Qfalse, Qfalse);
+	val = rb_yield_0(tag, 0, 0, 0, Qfalse);
     }
     else if (state == TAG_THROW && tag == prot_tag->dst) {
 	val = prot_tag->retval;