From 1325437297539bf433904b64db63a3186e62177e Mon Sep 17 00:00:00 2001 From: drbrain Date: Sat, 10 Apr 2010 06:36:13 +0000 Subject: * lib/rdoc: Import RDoc 2.5.2 * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc files, reverts r24976 in favor of include directive support in C parser. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/class_module.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/rdoc/class_module.rb') diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb index 321aaee57d..16b85d7918 100644 --- a/lib/rdoc/class_module.rb +++ b/lib/rdoc/class_module.rb @@ -146,10 +146,11 @@ class RDoc::ClassModule < RDoc::Context def merge class_module comment = class_module.comment + if comment then document = parse @comment - comment.parts.concat(document.parts) + comment.parts.concat document.parts @comment = comment end -- cgit v1.2.3