From ae6799529d282c4bf4bd3339299d1a7e430935d4 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Sep 2009 14:04:47 +0000
Subject: merge revision(s) 24403: 	* eval.c (rb_exc_raise, rb_exc_fatal):
 require exception object. 	  [ruby-core:24767]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 eval.c    | 2 ++
 version.h | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7b1490343a..389d36def6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep  6 19:47:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
+	  [ruby-core:24767]
+
 Sun Sep  6 01:34:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_connect): return value was broken when some
diff --git a/eval.c b/eval.c
index ab5a4f4a93..5fe6fb9fcc 100644
--- a/eval.c
+++ b/eval.c
@@ -4662,6 +4662,7 @@ void
 rb_exc_raise(mesg)
     VALUE mesg;
 {
+    mesg = rb_make_exception(1, &mesg);
     rb_longjmp(TAG_RAISE, mesg);
 }
 
@@ -4669,6 +4670,7 @@ void
 rb_exc_fatal(mesg)
     VALUE mesg;
 {
+    mesg = rb_make_exception(1, &mesg);
     rb_longjmp(TAG_FATAL, mesg);
 }
 
diff --git a/version.h b/version.h
index 518311a6dd..01d18c69fb 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-09-06"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090906
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
-- 
cgit v1.2.3