ruby-changes:42248
From: nagachika <ko1@a...>
Date: Tue, 29 Mar 2016 00:07:09 +0900 (JST)
Subject: [ruby-changes:42248] nagachika:r54322 (ruby_2_2): merge revision(s) 53943: [Backport #11969]
nagachika 2016-03-29 00:07:06 +0900 (Tue, 29 Mar 2016) New Revision: 54322 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54322 Log: 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] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/lib/irb.rb branches/ruby_2_2/version.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 54321) +++ ruby_2_2/ChangeLog (revision 54322) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Tue Mar 29 00:06:58 2016 Alex Boyd <alex@o...> + + * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. + [fix GH-1205][ruby-core:72773][Bug #11969] + Tue Mar 29 00:00:27 2016 CHIKANAGA Tomoyuki <nagachika@r...> * ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo. Index: ruby_2_2/lib/irb.rb =================================================================== --- ruby_2_2/lib/irb.rb (revision 54321) +++ ruby_2_2/lib/irb.rb (revision 54322) @@ -525,7 +525,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/irb.rb#L525 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 Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 54321) +++ ruby_2_2/version.h (revision 54322) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 264 +#define RUBY_PATCHLEVEL 265 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r53943 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/