ruby-changes:45807
From: naruse <ko1@a...>
Date: Sun, 12 Mar 2017 03:46:21 +0900 (JST)
Subject: [ruby-changes:45807] naruse:r57880 (ruby_2_4): merge revision(s) 57480:
naruse 2017-03-12 03:46:17 +0900 (Sun, 12 Mar 2017) New Revision: 57880 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57880 Log: merge revision(s) 57480: mkmf.rb: message format string * lib/mkmf.rb (checking_for): message needs format string. Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/lib/mkmf.rb branches/ruby_2_4/version.h Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 57879) +++ ruby_2_4/version.h (revision 57880) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-12" -#define RUBY_PATCHLEVEL 45 +#define RUBY_PATCHLEVEL 46 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_4/lib/mkmf.rb =================================================================== --- ruby_2_4/lib/mkmf.rb (revision 57879) +++ ruby_2_4/lib/mkmf.rb (revision 57880) @@ -943,10 +943,10 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/mkmf.rb#L943 a = r = nil Logging::postpone do r = yield - a = (fmt ? "#{fmt % r}" : r ? "yes" : "no") << "\n" - "#{f}#{m}-------------------- #{a}\n" + a = (fmt ? "#{fmt % r}" : r ? "yes" : "no") + "#{f}#{m}-------------------- #{a}\n\n" end - message(a) + message "%s\n", a Logging::message "--------------------\n\n" r end Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r57480 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/