kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Wrap parse_files' read in a version check for backwards compatibility.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2008-02-12 01:27:52 +00:00
parent dd738cd887
commit 030a513a49
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 12 10:25:02 2008
* lib/rdoc/rdoc.rb: Wrap parse_files' read in version check for
backwards compatibility.
Tue Feb 12 10:15:14 2008 NARUSE, Yui <naruse@ruby-lang.org> Tue Feb 12 10:15:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ruby.c (load_file): enc must effect source encoding. * ruby.c (load_file): enc must effect source encoding.

7
lib/rdoc/rdoc.rb
View file

@ -192,7 +192,12 @@ module RDoc
file_list.each do |fn| file_list.each do |fn|
$stderr.printf("\n%*s: ", width, fn) unless options.quiet $stderr.printf("\n%*s: ", width, fn) unless options.quiet
content = File.open(fn, "r:ascii-8bit") {|f| f.read} content = if RUBY_VERSION >= '1.9' then
File.open(fn, "r:ascii-8bit") { |f| f.read }
else
File.read fn
end
if /coding:\s*(\S+)/ =~ content[/\A(?:.*\n){0,2}/] if /coding:\s*(\S+)/ =~ content[/\A(?:.*\n){0,2}/]
if enc = Encoding.find($1) if enc = Encoding.find($1)
content.force_encoding(enc) content.force_encoding(enc)