2 files changed, 5 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f9fddd9e3..6ae6633aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 20 18:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_catch): backout.
+
 Mon Oct 20 17:31:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
diff --git a/eval.c b/eval.c
index c7a778716d..623c984068 100644
--- a/eval.c
+++ b/eval.c
@@ -10217,19 +10217,7 @@ rb_catch(tag, func, data)
     VALUE (*func)();
     VALUE data;
 {
-    int state;
-    VALUE val = Qnil;		/* OK */
-
-    PUSH_TAG(PROT_NONE);
-    PUSH_SCOPE();
-    if ((state = EXEC_TAG()) == 0) {
-	val = rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
-    }
-    POP_SCOPE();
-    POP_TAG();
-    if (state) JUMP_TAG(state);
-
-    return val;
+    return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
 }
 
 static VALUE