diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 8 04:58:05 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:55:26 2008 James Edward Gray II <jeg2@ruby-lang.org> Merged 14070 from trunk. @@ -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); } } } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 154 +#define RUBY_PATCHLEVEL 155 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |