summaryrefslogtreecommitdiffstats
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
commit59cb79532b1f79cf992876b2e64d5f4665ae22f6 (patch)
treec6114c42796d9ea2d47780720a0cb2ed1931e60c
parent09e401433211f1f21a944250c5e23cb0f8f57599 (diff)
downloadruby-59cb79532b1f79cf992876b2e64d5f4665ae22f6.tar.gz
ruby-59cb79532b1f79cf992876b2e64d5f4665ae22f6.tar.xz
ruby-59cb79532b1f79cf992876b2e64d5f4665ae22f6.zip
Don't merge ri files if is nil/empty
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 316fc9190..e5ea9f2fb 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