diff options
Diffstat (limited to 'lib/rdoc/markup/document.rb')
| -rw-r--r-- | lib/rdoc/markup/document.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb index 7077f357d3..6fbef33ae3 100644 --- a/lib/rdoc/markup/document.rb +++ b/lib/rdoc/markup/document.rb @@ -71,7 +71,9 @@ class RDoc::Markup::Document # Does this document have no parts? def empty? - @parts.empty? or (@parts.length == 1 and merged? and @parts.first.empty?) + @parts.empty? or + (@parts.length == 1 and RDoc::Markup::Document === @parts.first and + @parts.first.empty?) end ## @@ -83,11 +85,6 @@ class RDoc::Markup::Document # The information in +other+ is preferred over the receiver def merge other - if empty? then - @parts = other.parts - return self - end - other.parts.each do |other_part| self.parts.delete_if do |self_part| self_part.file and self_part.file == other_part.file @@ -99,13 +96,6 @@ class RDoc::Markup::Document self end - ## - # Does this Document contain other Documents? - - def merged? - RDoc::Markup::Document === @parts.first - end - def pretty_print q # :nodoc: start = @file ? "[doc (#{@file}): " : '[doc: ' |