summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-29 19:17:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-29 19:17:18 +0000
commitae19e6ec03be9c6fca6c23dd7a6fa38d72d7a057 (patch)
tree4cb7c2135f1e4b6fcfbf4b838c538da62747a616
parente814ab12532e45505c83167ddcbe355fe9541bed (diff)
downloadruby-ae19e6ec03be9c6fca6c23dd7a6fa38d72d7a057.tar.gz
ruby-ae19e6ec03be9c6fca6c23dd7a6fa38d72d7a057.tar.xz
ruby-ae19e6ec03be9c6fca6c23dd7a6fa38d72d7a057.zip
* eval.c (rb_eval_cmd): just return if no exceptions.
[ruby-dev:30820] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b943177e8..b305580ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 04:18:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval_cmd): just return if no exceptions.
+ [ruby-dev:30820]
+
Wed May 30 02:14:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (interrupt_init): needs to pass nil for Interrupt.
diff --git a/eval.c b/eval.c
index 106f2c95a..31b9bd1b6 100644
--- a/eval.c
+++ b/eval.c
@@ -333,7 +333,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
POP_TAG();
rb_set_safe_level_force(safe);
- th_jump_tag_but_local_jump(state, val);
+ if (state) th_jump_tag_but_local_jump(state, val);
return val;
}