From b27cbbab474270d43df769aec9bcbfee624fb602 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 8 Jun 2007 08:40:23 +0000 Subject: * eval.c (rb_eval_cmd): just return if no exceptions. [ruby-dev:30820] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30b68513e..38e637c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 30 04:18:37 2007 Nobuyoshi Nakada + + * eval.c (rb_eval_cmd): just return if no exceptions. + [ruby-dev:30820] + Tue May 29 11:01:06 2007 Nobuyoshi Nakada * win32/win32.c (rb_w32_opendir): store attributes of the second diff --git a/eval.c b/eval.c index 164d13487..4b057afb6 100644 --- a/eval.c +++ b/eval.c @@ -1862,7 +1862,7 @@ rb_eval_cmd(cmd, arg, level) POP_TAG(); POP_FRAME(); - jump_tag_but_local_jump(state, val); + if (state) jump_tag_but_local_jump(state, val); return val; } diff --git a/version.h b/version.h index e0aca32fb..cb75d5f7c 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-06-07" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070607 -#define RUBY_PATCHLEVEL 32 +#define RUBY_PATCHLEVEL 33 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit