merges r24401 from trunk into ruby_1_9_1.

--
* eval.c (rb_longjmp): reset raised flag before fatal error.

* eval_error.c (error_print): file can be NULL. line can be 0.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/eval_error.c b/eval_error.c
index 622ae4fdd9..65f1f4a7b7 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -87,10 +87,12 @@ error_print(void)
     if (NIL_P(errat)) {
 	const char *file = rb_sourcefile();
 	int line = rb_sourceline();
-	if (file)
-	    warn_printf("%s:%d", file, line);
-	else
+	if (!file)
 	    warn_printf("%d", line);
+	else if (!line)
+	    warn_printf("%s", file);
+	else
+	    warn_printf("%s:%d", file, line);
     }
     else if (RARRAY_LEN(errat) == 0) {
 	error_pos();