summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 08:40:23 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 08:40:23 (GMT)
commit0b66d3531f44f3cf8e83df25c32bcbf6e0a8f3fa (patch)
treeaf585bcf568b76007effe6a69cc5504782b9874a
parentc30183b3b99052c0c0cacf0b46ec297c199a597a (diff)
* eval.c (rb_eval_cmd): just return if no exceptions.
[ruby-dev:30820] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 30b6851..38e637c 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]
+
Tue May 29 11:01:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_opendir): store attributes of the second
diff --git a/eval.c b/eval.c
index 164d134..4b057af 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 e0aca32..cb75d5f 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