3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bacfe1810..e289c5947c 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 3aa5a3957a..ea48b775cb 100644
--- a/eval.c
+++ b/eval.c
@@ -1865,7 +1865,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 934a9d11e7..2d8f5d2f0c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-05-29"
+#define RUBY_RELEASE_DATE "2007-05-30"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070529
+#define RUBY_RELEASE_CODE 20070530
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];