* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by

RUBY_VERSION.  reapplied r24990.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,4 +1,7 @@
-Fri Apr  2 14:24:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr  2 14:26:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
+	  RUBY_VERSION.  reapplied r24990.
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
 	  are delimited by a semicolon.  supported Vim style.  reapplied

lib/rdoc/rdoc.rb

@@ -380,11 +380,7 @@ The internal error was:
   end
 
   def read_file_contents(filename)
-    content = if RUBY_VERSION >= '1.9' then
-                File.open(filename, "r:ascii-8bit") { |f| f.read }
-              else
-                File.read filename
-              end
+    content = File.open(filename, "rb") { |f| f.read }
 
     if defined? Encoding then
       if /coding[=:]\s*([^\s;]+)/i =~ content[%r"\A(?:#!.*\n)?.*\n"]