diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 01:30:18 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 01:30:18 +0000 |
| commit | 95e213d3542034e0fd2613de6990a7ddfe5718ca (patch) | |
| tree | 76ec64fccb338dbcbc4d3f07c2f494ef9b7fe1ff /lib/rdoc/markup | |
| parent | 41fb243684f60e231fc77ec54752fe4e844523d5 (diff) | |
Merge rdoc-6.1.0.beta1.
* https://github.com/ruby/rdoc/compare/v6.0.4...v6.1.0.beta1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/markup')
| -rw-r--r-- | lib/rdoc/markup/to_html.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/markup/to_html_crossref.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index c5e1f073f8..79b13e1819 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -200,7 +200,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter content = if verbatim.ruby? or parseable? text then begin - tokens = RDoc::RipperStateLex.parse text + tokens = RDoc::Parser::RipperStateLex.parse text klass = ' class="ruby"' result = RDoc::TokenStream.to_html tokens diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb index 2911aee954..cc93021540 100644 --- a/lib/rdoc/markup/to_html_crossref.rb +++ b/lib/rdoc/markup/to_html_crossref.rb @@ -135,9 +135,6 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml ref = @cross_reference.resolve name, text - text = ref.output_name @context if - RDoc::MethodAttr === ref and text == original_name - case ref when String then ref |