summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-14 20:42:36 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-14 20:42:36 +0000
commita6514fc730b01e8a02759591a7bf435e0cc0cbf6 (patch)
tree83383b3ddd72e83438e2eef060f0d05504b48a70 /lib
parent83bc0edef3a7e979ecfe639f97386c19fcf96707 (diff)
downloadruby-a6514fc730b01e8a02759591a7bf435e0cc0cbf6.tar.gz
ruby-a6514fc730b01e8a02759591a7bf435e0cc0cbf6.tar.xz
ruby-a6514fc730b01e8a02759591a7bf435e0cc0cbf6.zip
Don't merge ri files if is nil/empty
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10264 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 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