diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-12 10:57:22 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-12 10:57:22 +0000 |
| commit | 22b831e358d4f68093b78225e6d046745a0c8e0a (patch) | |
| tree | 58bca88a6f85806d865a747f5baa573c93a1c74c /lib/rdoc | |
| parent | effc46cfbfcf62c71de6c9da18e4902e96e999fd (diff) | |
| download | ruby-22b831e358d4f68093b78225e6d046745a0c8e0a.tar.gz ruby-22b831e358d4f68093b78225e6d046745a0c8e0a.tar.xz ruby-22b831e358d4f68093b78225e6d046745a0c8e0a.zip | |
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/generators/html_generator.rb | 6 | ||||
| -rw-r--r-- | lib/rdoc/generators/ri_generator.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index f9c72a4df..d263a1478 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -314,7 +314,7 @@ module Generators def collect_methods list = @context.method_list unless @options.show_all - list = list.find_all {|m| m.visibility == :public || m.force_documentation } + list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation } end @methods = list.collect {|m| HtmlMethod.new(m, self, @options) } end @@ -681,13 +681,13 @@ module Generators res = [] atts.each do |att| next unless att.section == section - if att.visibility == :public || @options.show_all + if att.visibility == :public || att.visibility == :protected || @options.show_all entry = { "name" => CGI.escapeHTML(att.name), "rw" => att.rw, "a_desc" => markup(att.comment, true) } - unless att.visibility == :public + unless att.visibility == :public || att.visibility == :protected entry["rw"] << "-" end res << entry diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb index 8d9457934..c4b4a7e17 100644 --- a/lib/rdoc/generators/ri_generator.rb +++ b/lib/rdoc/generators/ri_generator.rb @@ -172,7 +172,7 @@ module Generators list = cls.method_list unless @options.show_all list = list.find_all do |m| - m.visibility == :public || m.force_documentation + m.visibility == :public || m.visibility == :protected || m.force_documentation end end |