summaryrefslogtreecommitdiff
path: root/lib/rdoc/markup
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-10 02:01:00 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-10 02:01:00 +0000
commitdb6c51ec4f9d1b7386215cad5924e6e03733b6d6 (patch)
treea9c5accde00bbc0263aebb5b6d65f0922b9aef20 /lib/rdoc/markup
parent4e1fe5357e0286c738e9aaca5201765d187fbed3 (diff)
Merge rdoc-6.0.0.beta3.
* It version introduced did you mean? feature for ri command: https://github.com/ruby/rdoc/pull/533 * Removed obbsoleted ruby_token.rbb. [Bug #13990][ruby-core:83180] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/markup')
-rw-r--r--lib/rdoc/markup/to_html.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index 98ed7926fd..d2c9a23a79 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -206,7 +206,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
result = RDoc::TokenStream.to_html tokens
result = result + "\n" unless "\n" == result[-1]
result
- rescue RDoc::RubyLex::Error
+ rescue
CGI.escapeHTML text
end
else