summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-09 12:40:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-09 12:40:17 +0000
commit3dadc8848c417c25a2408efe3bb7e5c2879feac1 (patch)
treeb25e7659966971f0f46ac66ebb1e0373e49ae9e9
parentc85f041deb3207eee5445539845575537ed5dc71 (diff)
downloadruby-3dadc8848c417c25a2408efe3bb7e5c2879feac1.tar.gz
ruby-3dadc8848c417c25a2408efe3bb7e5c2879feac1.tar.xz
ruby-3dadc8848c417c25a2408efe3bb7e5c2879feac1.zip
* eval.c (ruby_cleanup): keep the exception till after END blocks.
[ruby-core:09675] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ca7575cf9..5f961f040 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 2b6fda37f..dff4dc1c7 100644
--- a/eval.c
+++ b/eval.c
@@ -1564,7 +1564,6 @@ ruby_cleanup(ex)
ruby_safe_level = 0;
Init_stack((void*)&state);
ruby_finalize_0();
- if (ruby_errinfo) err = ruby_errinfo;
PUSH_TAG(PROT_NONE);
PUSH_ITER(ITER_NOT);
if ((state = EXEC_TAG()) == 0) {