From 3629264d825c52c44eb89bf1cb0aad246bb09941 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 9 Dec 2006 12:40:17 +0000
Subject: * eval.c (ruby_cleanup): keep the exception till after END blocks.  
 [ruby-core:09675]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 eval.c    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fe1cb60a8..b887c0947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): keep the exception till after END blocks.
+	  [ruby-core:09675]
+
 Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
diff --git a/eval.c b/eval.c
index 1e582dcbc..dc70f6611 100644
--- a/eval.c
+++ b/eval.c
@@ -1553,7 +1553,6 @@ ruby_cleanup(int ex)
     PUSH_THREAD_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	ruby_finalize_0();
-	if (ruby_errinfo) err = ruby_errinfo;
 	rb_thread_cleanup();
 	rb_thread_wait_other_threads();
     }
-- 
cgit