summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-08 02:07:53 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-08 02:07:53 +0000
commite75d8e0c65a63c2545d02ecef3811543c2d0266b (patch)
treef18f7b5f7bcc52625741f289ad3dd8583c822334 /lib
parentf5f218f7c2ebe712562155e78daef013696d40a4 (diff)
Merge rdoc-6.0.4 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rdoc.rb2
-rw-r--r--lib/rdoc/parser/ruby.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index 21b037adee..a4288679c0 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -65,7 +65,7 @@ module RDoc
##
# RDoc version you are using
- VERSION = '6.0.3'
+ VERSION = '6.0.4'
##
# Method visibilities
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index 6fe4a89e46..a90622f0f3 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -363,6 +363,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
container ||=
if ignore_constants then
c = RDoc::NormalModule.new name_t[:text]
+ c.store = @store
new_modules << [prev_container, c]
c
else