diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 06:36:13 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 06:36:13 +0000 |
| commit | 1325437297539bf433904b64db63a3186e62177e (patch) | |
| tree | 01608a107ec3939b1013152d961b6407a5ba9c25 /lib/rdoc/class_module.rb | |
| parent | ce2b574017cacc2c3f2b0e92f82a7f250639fc34 (diff) | |
| download | ruby-1325437297539bf433904b64db63a3186e62177e.tar.gz | |
* 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
Diffstat (limited to 'lib/rdoc/class_module.rb')
| -rw-r--r-- | lib/rdoc/class_module.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |