summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92babe5b31..2f03a1ca97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 38861766d1..d41887e7b3 100644
--- a/version.h
+++ b/version.h
@@ -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