diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 01:41:25 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 01:41:25 +0000 |
| commit | d42d6e690e3f553b971322eae783ac6b0d4d9692 (patch) | |
| tree | 2004bf4517ee7b81466c300cf30092e62e65467e /lib/rdoc/rdoc.rb | |
| parent | 670c6e8ce9d4a12bb4832e10fab27365398649bf (diff) | |
* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/rdoc.rb')
| -rw-r--r-- | lib/rdoc/rdoc.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index b41434ba39..4d45d47978 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -305,6 +305,9 @@ option) when "directory" then next if rel_file_name == "CVS" || rel_file_name == ".svn" + created_rid = File.join rel_file_name, "created.rid" + next if File.file? created_rid + dot_doc = File.join rel_file_name, RDoc::DOT_DOC_FILENAME if File.file? dot_doc then @@ -336,7 +339,7 @@ option) # Parses +filename+ and returns an RDoc::TopLevel def parse_file filename - if defined?(Encoding) then + if Object.const_defined? :Encoding then encoding = @options.encoding filename = filename.encode encoding end @@ -411,8 +414,6 @@ The internal error was: return [] if file_list.empty? - file_info = [] - @stats.begin_adding file_info = file_list.map do |filename| @@ -565,4 +566,5 @@ end # require built-in generators after discovery in case they've been replaced require 'rdoc/generator/darkfish' require 'rdoc/generator/ri' +require 'rdoc/generator/pot' |