nagachika	2018-03-04 06:54:45 +0900 (Sun, 04 Mar 2018)

  New Revision: 62645

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

  Log:
    merge revision(s) 59867: [Backport #13894]
    
    test/win32ole/test_word.rb: word quit without confirmation dialog to save 
    files. [Bug #13894] Thanks to h.shirosaki.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/win32ole/test_word.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/test/win32ole/test_word.rb
===================================================================
--- ruby_2_4/test/win32ole/test_word.rb	(revision 62644)
+++ ruby_2_4/test/win32ole/test_word.rb	(revision 62645)
@@ -8,17 +8,22 @@ rescue LoadError https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/win32ole/test_word.rb#L8
 end
 require "test/unit"
 
+if defined?(WIN32OLE)
+  module Word; end
+end
+
 def word_installed?
   installed = false
   w = nil
   if defined?(WIN32OLE)
     begin
       w = WIN32OLE.new('Word.Application')
+      WIN32OLE.const_load(w, Word)
       installed = true
     rescue
     ensure
       if w
-        w.quit
+        w.quit(Word::WdDoNotSaveChanges)
         w = nil
       end
     end
@@ -59,7 +64,7 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/win32ole/test_word.rb#L64
 
       def teardown
         if @obj
-          @obj.quit
+          @obj.quit(Word::WdDoNotSaveChanges)
           @obj = nil
         end
       end
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62644)
+++ ruby_2_4/version.h	(revision 62645)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
-#define RUBY_RELEASE_DATE "2018-03-03"
-#define RUBY_PATCHLEVEL 245
+#define RUBY_RELEASE_DATE "2018-03-04"
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62644)
+++ ruby_2_4	(revision 62645)

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

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