From bcdcc6099a682f5a558d493a5a91c48c694070f0 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Jun 2006 01:20:24 +0000
Subject: * lib/getoptlong.rb (GetoptLong#set_options): recieve arguments   as
 Array.

* lib/irb/slex.rb: use Proc#yield.

* lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
  of String#[].

* lib/rdoc/ri/ri_write.rb: ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/markup/simple_markup/inline.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/rdoc/markup')

diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
index 1e76c201c..9ca585735 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)
@@ -293,7 +295,7 @@ module SM
 
       # skip leading invisible text
       i = 0
-      i += 1 while i < str_len and @str[i].zero?
+      i += 1 while i < str_len and @str[i] == "\0"
       start_pos = i
 
       # then scan the string, chunking it on attribute changes
@@ -319,7 +321,7 @@ module SM
         # move on, skipping any invisible characters
         begin
           i += 1
-        end while i < str_len and @str[i].zero?
+        end while i < str_len and @str[i] == "\0"
       end
       
       # tidy up trailing text
-- 
cgit