Merge from HEAD.

Add --system, --site, --home, --gems to ri.
Allow --doc-dir to be specified multiple times.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
index 1e76c201c9..d54fe1e667 100644
--- a/lib/rdoc/markup/simple_markup/inline.rb
+++ b/lib/rdoc/markup/simple_markup/inline.rb
@@ -183,7 +183,7 @@ module SM
       unless SPECIAL.empty?
         SPECIAL.each do |regexp, attr|
           str.scan(regexp) do
-            attrs.set_attrs($`.length, $1.length, attr | Attribute::SPECIAL)
+            attrs.set_attrs($`.length, $&.length, attr | Attribute::SPECIAL)
           end
         end
       end
@@ -215,6 +215,8 @@ module SM
       add_html("b",  :BOLD)
       add_html("tt",   :TT)
       add_html("code", :TT)
+
+      add_special(/<!--(.*?)-->/, :COMMENT)
     end
 
     def add_word_pair(start, stop, name)
diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb
index bbbae1b77c..101c9bdeb1 100644
--- a/lib/rdoc/markup/simple_markup/preprocess.rb
+++ b/lib/rdoc/markup/simple_markup/preprocess.rb
@@ -43,7 +43,12 @@ module SM
     def include_file(name, indent)
       if (full_name = find_include_file(name))
         content = File.open(full_name) {|f| f.read}
-        res = content.gsub(/^#?/, indent)
+        # strip leading '#'s, but only if all lines start with them
+        if content =~ /^[^#]/
+          content.gsub(/^/, indent)
+        else
+          content.gsub(/^#?/, indent)
+        end
       else
         $stderr.puts "Couldn't find file to include: '#{name}'"
         ''