2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fe1cb60a8e..b887c09476 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 1e582dcbcb..dc70f66116 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();
     }