summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-14 22:24:36 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-14 22:24:36 +0000
commit9a811c98e60fd1f613e185d13808bc908759ff88 (patch)
treec6114c42796d9ea2d47780720a0cb2ed1931e60c /lib
parentdf05423ad8f82cfbb74e0cb81aa49f74fe1fc34a (diff)
Don't merge ri files if is nil/empty
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rdoc/ri/ri_descriptions.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/rdoc/ri/ri_descriptions.rb b/lib/rdoc/ri/ri_descriptions.rb
index 316fc91903..e5ea9f2fbf 100644
--- a/lib/rdoc/ri/ri_descriptions.rb
+++ b/lib/rdoc/ri/ri_descriptions.rb
@@ -95,8 +95,10 @@ module RI
if @comment.nil? || @comment.empty?
@comment = old.comment
else
- @comment << SM::Flow::RULE.new
- @comment.concat old.comment
+ unless old.comment.nil? or old.comment.empty? then
+ @comment << SM::Flow::RULE.new
+ @comment.concat old.comment
+ end
end
end