From 8cdd45d15be79f0232b38b82074344e52baa4d85 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 12 Feb 2005 10:57:22 +0000
Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/generators/html_generator.rb | 6 +++---
 lib/rdoc/generators/ri_generator.rb   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/rdoc')

diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index f9c72a4df2..d263a14784 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 8d94579347..c4b4a7e17c 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
 
-- 
cgit v1.2.3