summaryrefslogtreecommitdiff
path: root/lib/rdoc/rdoc.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rdoc/rdoc.rb')
-rw-r--r--lib/rdoc/rdoc.rb8
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'