diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
| commit | 39432526b68e90906f25742b2736a2b2141f2d2d (patch) | |
| tree | 3f232a2aff8e6e61f591f9d799a9e6a19ff2e29b /lib | |
| parent | ac81a6e38d85ad623f699d4ed8dd319b5fb28d32 (diff) | |
merge revision(s) 33902:
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
on Windows.
see https://github.com/rdoc/rdoc/issues/87
* test/rdoc/test_rdoc_markup_pre_process.rb
(TestRDocMarkupPreProcess#test_include_file,
TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
follow above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/encoding.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb index 813d5ea6fa..ab752ee665 100644 --- a/lib/rdoc/encoding.rb +++ b/lib/rdoc/encoding.rb @@ -20,6 +20,7 @@ module RDoc::Encoding def self.read_file filename, encoding, force_transcode = false content = open filename, "rb" do |f| f.read end + content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/ utf8 = content.sub!(/\A\xef\xbb\xbf/, '') |