ruby-changes:5466
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 04:58:03 +0900 (JST)
Subject: [ruby-changes:5466] Ruby:r16968 (ruby_1_8_5): merge revision(s) 14086:
shyouhei 2008-06-08 04:57:42 +0900 (Sun, 08 Jun 2008) New Revision: 16968 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/eval.c branches/ruby_1_8_5/version.h Log: merge revision(s) 14086: * eval.c (error_print): put newline unless multiple line message ends with a newline. [ruby-dev:32429] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16968&r2=16967&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16968&r2=16967&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=16968&r2=16967&diff_format=u Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16967) +++ ruby_1_8_5/ChangeLog (revision 16968) @@ -1,3 +1,8 @@ +Sun Jun 8 04:56:55 2008 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> Merged 14070 from trunk. Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16967) +++ ruby_1_8_5/version.h (revision 16968) @@ -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 Index: ruby_1_8_5/eval.c =================================================================== --- ruby_1_8_5/eval.c (revision 16967) +++ ruby_1_8_5/eval.c (revision 16968) @@ -1301,8 +1301,9 @@ 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); } } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/