merges r20585 from trunk into ruby_1_9_1.

* eval.c (rb_make_exception): single argument to raise may be
  string compatible object.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index 636c225565..9c99711ce9 100644
--- a/eval.c
+++ b/eval.c
@@ -477,13 +477,13 @@ rb_make_exception(int argc, VALUE *argv)
     mesg = Qnil;
     switch (argc) {
       case 0:
-	mesg = Qnil;
 	break;
       case 1:
 	if (NIL_P(argv[0]))
 	    break;
-	if (TYPE(argv[0]) == T_STRING) {
-	    mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
+	mesg = rb_check_string_type(argv[0]);
+	if (!NIL_P(mesg)) {
+	    mesg = rb_exc_new3(rb_eRuntimeError, mesg);
 	    break;
 	}
 	n = 0;