aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/markup/to_html_crossref.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59407bab9e..b3c57ad9a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 24 00:02:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rdoc/markup/to_html_crossref.rb: fix failure of the test.
+ [ruby-core:20564]
+
Sat Jan 23 23:27:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* dir.c (dir_s_glob): add rdoc by Roger Pack. [ruby-core:27669]
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
index e73fbf5c8f..930218bb7e 100644
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ b/lib/rdoc/markup/to_html_crossref.rb
@@ -65,7 +65,7 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
# The key thing is that there must be at least
# one special character (period, slash, or
# underscore).
- | [\/\w]+[_\/\.][\w\/\.]+
+ | (?:\.\.\/)*[-\/\w]+[_\/\.][-\w\/\.]+
# Things that have markup suppressed
| \\[^\s]