nobu	2009-09-18 09:03:18 +0900 (Fri, 18 Sep 2009)

  New Revision: 24990

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24990

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

  Modified files:
    trunk/lib/rdoc/rdoc.rb

Index: lib/rdoc/rdoc.rb
===================================================================
--- lib/rdoc/rdoc.rb	(revision 24989)
+++ lib/rdoc/rdoc.rb	(revision 24990)
@@ -203,11 +203,8 @@
       file_list.each do |filename|
         @stats.add_file 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 }
+        content.gsub!(/\r$/, '')
 
         if defined?(::Encoding) then
           if /coding[=:]\s*([^\s;]+)/ =~ content[/\A(?:!.*\n)?(.*\n)/, 1]

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