1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
shyouhei 2008-06-07 19:57:42 +00:00
parent 18da18fcfb
commit f68586bc2d
3 changed files with 8 additions and 2 deletions

View file

@ -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.

3
eval.c
View file

@ -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);
}
}
}

View file

@ -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