From 07c9743eb0574df423ea1750bc6287d2b1e791c8 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 29 Mar 2016 06:10:16 +0000 Subject: merge revision(s) 53943: [Backport #11969] * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. [fix GH-1205][ruby-core:72773][Bug #11969] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/irb.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98d5f7e74d..b2566af36e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 29 15:10:05 2016 Alex Boyd + + * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. + [fix GH-1205][ruby-core:72773][Bug #11969] + Tue Mar 29 15:05:16 2016 CHIKANAGA Tomoyuki * ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo. diff --git a/lib/irb.rb b/lib/irb.rb index 45f328008c..92b79b3301 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -525,7 +525,7 @@ module IRB print messages.join("\n"), "\n" unless lasts.empty? printf "... %d levels...\n", levels if levels > 0 - print lasts.join("\n") + print lasts.join("\n"), "\n" end print "Maybe IRB bug!\n" if irb_bug end diff --git a/version.h b/version.h index 754e0d7d45..7d6785e45b 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 27 +#define RUBY_PATCHLEVEL 28 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3