usa	2016-12-27 18:17:23 +0900 (Tue, 27 Dec 2016)

  New Revision: 57207

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

  Log:
    merge revision(s) 56224: [Backport #12785]
    
    * test/misc/test_ruby_mode.rb (assert_indent): since write-region
      in Emacs 25.1 no longer displays the "Wrote file" message, shows
      the explicit message to check if successfully finished.
      [ruby-core:77355] [Bug #12785]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/misc/test_ruby_mode.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57206)
+++ ruby_2_2/version.h	(revision 57207)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
-#define RUBY_RELEASE_DATE "2016-11-15"
-#define RUBY_PATCHLEVEL 397
+#define RUBY_RELEASE_DATE "2016-12-27"
+#define RUBY_PATCHLEVEL 398
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/misc/test_ruby_mode.rb
===================================================================
--- ruby_2_2/test/misc/test_ruby_mode.rb	(revision 57206)
+++ ruby_2_2/test/misc/test_ruby_mode.rb	(revision 57207)
@@ -18,6 +18,9 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/misc/test_ruby_mode.rb#L18
 class TestRubyMode
   EVAL_OPT = "--eval"
   EXPR_SAVE = "(save-buffer)"
+  finish_mark = "ok-#{$$}"
+  FINISH_MARK = /^#{finish_mark}$/
+  EXPR_FINISH = "(print \'#{finish_mark})"
   EXPR_RUBYMODE = "(ruby-mode)"
   EXPR_NOBACKUP = "(progn" \
   " (set (make-local-variable \'backup-inhibited) t)" \
@@ -31,6 +34,7 @@ class TestRubyMode https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/misc/test_ruby_mode.rb#L34
     exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten
     exprs.unshift(EVAL_OPT, EXPR_RUBYMODE)
     exprs.unshift(EVAL_OPT, EXPR_NOBACKUP)
+    exprs.push(EVAL_OPT, EXPR_FINISH)
     output = IO.popen([*EMACS, tmp.path, *exprs, err:[:child, :out]], "r") {|e| e.read}
     tmp.open
     result = tmp.read
@@ -49,7 +53,7 @@ class TestRubyMode https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/misc/test_ruby_mode.rb#L53
         source.gsub!(space, '')
       end
       result, output = run_emacs(source, EXPR_INDENT, EXPR_SAVE)
-      assert_match(/^Wrote /, output)
+      assert_match(FINISH_MARK, output)
       assert_equal(expected, result, message(*message) {diff expected, result})
     end
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56224


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