2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 02e86d1b6..7c3c36d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,11 @@ Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
 	  not use String#split("/"). (backported from HEAD)
 
+Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (break_jump): break should not cross functions.
+	  [ruby-list:40818]
+
 Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
diff --git a/eval.c b/eval.c
index 65329ff7b..e7daf7699 100644
--- a/eval.c
+++ b/eval.c
@@ -4672,6 +4672,9 @@ break_jump(retval)
 	    tt->retval = retval;
 	    JUMP_TAG(TAG_BREAK);
 	    break;
+	  case PROT_FUNC:
+	    tt = 0;
+	    continue;
 	  default:
 	    break;
 	}