2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9a668ffef..34537570f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 20 21:16:48 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/fileutils.rb: revert a line modified accidentally at r34669.
+	  This fixes mingw test errors in TestDir_M17N.
+	  [ruby-core:42728] [Feature #4970]
+
 Mon Feb 20 21:09:27 2012  Tanaka Akira  <akr@fsij.org>
 
 	* ext/curses/curses.c (Init_curses): define Curses::VERSION.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 8d1009bda3..46dfffb650 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1342,7 +1342,7 @@ private
 
     def entries
       opts = {}
-      opts[:encoding] = "UTF-8" if /mswin|mignw/ =~ RUBY_PLATFORM
+      opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
       Dir.entries(path(), opts)\
           .reject {|n| n == '.' or n == '..' }\
           .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }