diff --git a/ChangeLog b/ChangeLog
index 0599328997..940fa864a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 22 23:59:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (return_jump, break_jump): raise unexpceted local jump
+	  exception directly.  [ruby-dev:23740]
+
 Tue Jun 22 23:35:43 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): support FZERO and FSPACE with NaN/Inf.
diff --git a/eval.c b/eval.c
index b068b52c49..f42be098a8 100644
--- a/eval.c
+++ b/eval.c
@@ -4536,7 +4536,7 @@ return_jump(retval)
 	}
 	tt = tt->prev;
     }
-    proc_jump_error(TAG_RETURN, retval);
+    localjump_error("unexpected return", retval, TAG_RETURN);
 }
 
 static void
@@ -4561,7 +4561,7 @@ break_jump(retval)
 	}
 	tt = tt->prev;
     }
-    proc_jump_error(TAG_BREAK, retval);
+    localjump_error("unexpected break", retval, TAG_BREAK);
 }
 
 static VALUE