merge revision(s) 14086:

	* eval.c (error_print): put newline unless multiple line message ends
	  with a newline.  [ruby-dev:32429]


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

1 files changed, 2 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 505665d513..e2b822e3cf 100644
--- a/eval.c
+++ b/eval.c
@@ -1298,8 +1298,9 @@ error_print()
 		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
 		warn_print(")\n");
 	    }
-	    if (tail) {
+	    if (tail && elen>len+1) {
 		warn_print2(tail, elen-len-1);
+		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
 	    }
 	}
     }