diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 08:22:04 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 08:22:04 +0000 |
commit | 26154da303cda2658cb6351e0a360d772ffd70d7 (patch) | |
tree | 8ee7ed2ac770666eaaa66474cdff3f2098bb275d | |
parent | 32089305127f6bd26bd684c75818df4fcd9c0f9d (diff) |
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_1@54263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/irb.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Mar 25 17:21:51 2016 Alex Boyd <alex@opengroove.org> + + * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. + [fix GH-1205][ruby-core:72773][Bug #11969] + Fri Mar 25 17:18:59 2016 Naohisa Goto <ngotogenome@gmail.com> * enc/windows_1250.c: Should not use C++ style comments (C99 feature). diff --git a/lib/irb.rb b/lib/irb.rb index 20390d2205..a5962145f3 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -526,7 +526,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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-25" -#define RUBY_PATCHLEVEL 460 +#define RUBY_PATCHLEVEL 461 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |