usa	2016-03-25 17:22:04 +0900 (Fri, 25 Mar 2016)

  New Revision: 54263

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54263

  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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/irb.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/lib/irb.rb
===================================================================
--- ruby_2_1/lib/irb.rb	(revision 54262)
+++ ruby_2_1/lib/irb.rb	(revision 54263)
@@ -526,7 +526,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/irb.rb#L526
             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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 54262)
+++ ruby_2_1/version.h	(revision 54263)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 54262)
+++ ruby_2_1/ChangeLog	(revision 54263)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Mar 25 17:21:51 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]
+
 Fri Mar 25 17:18:59 2016  Naohisa Goto  <ngotogenome@g...>
 
 	* enc/windows_1250.c: Should not use C++ style comments (C99 feature).

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53943


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/