summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:57:42 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:57:42 +0000
commitf68586bc2de8052bc4bd263b1b779dbb4ec9c5da (patch)
tree0cb919b07d7281e3a48315e5dd65457a90e20a59
parent18da18fcfb0dc3461055528b5311fa852e0bf27d (diff)
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_5@16968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6534771..95c81c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 8 04:56:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (error_print): put newline unless multiple line message ends
+ with a newline. [ruby-dev:32429]
+
Sun Jun 8 04:54:36 2008 James Edward Gray II <jeg2@ruby-lang.org>
Merged 14070 from trunk.
diff --git a/eval.c b/eval.c
index 080aaf4..98493b6 100644
--- a/eval.c
+++ b/eval.c
@@ -1301,8 +1301,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);
}
}
}
diff --git a/version.h b/version.h
index a0947d5..f8dd55b 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8