naruse	2018-02-21 15:00:51 +0900 (Wed, 21 Feb 2018)

  New Revision: 62510

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

  Log:
    merge revision(s) 61469: [Backport #14427]
    
    irb.rb: fix highlight
    
    * lib/irb.rb (IRB::Irb#eval_input): fix highlight for multiple
      lines exception messages.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/lib/irb.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/lib/irb.rb
===================================================================
--- ruby_2_5/lib/irb.rb	(revision 62509)
+++ ruby_2_5/lib/irb.rb	(revision 62510)
@@ -527,7 +527,9 @@ module IRB https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/irb.rb#L527
               printf "... %d levels...\n", levels if levels > 0
             end
             puts messages.reverse
-            print "#{attr[1]}#{exc.class} (#{attr[4]}#{exc}#{attr[0, 1]})#{attr[]}\n"
+            messages = exc.to_s.split(/\n/)
+            print "#{attr[1]}#{exc.class} (#{attr[4]}#{messages.shift}#{attr[0, 1]})#{attr[]}\n"
+            puts messages.map {|s| "#{attr[1]}#{s}#{attr[]}\n"}
             print "Maybe IRB bug!\n" if irb_bug
           end
         end
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 62509)
+++ ruby_2_5/version.h	(revision 62510)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-02-21"
-#define RUBY_PATCHLEVEL 27
+#define RUBY_PATCHLEVEL 28
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 62509)
+++ ruby_2_5	(revision 62510)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61469

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