From ba6ae341bab83dfc7a624c5bf20d8d162dacaff9 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 7 Sep 2016 22:23:38 +0000 Subject: * lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2 Fixed ri parse defect with left-hand matched classes. https://github.com/rdoc/rdoc/pull/420 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/generator/darkfish.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/rdoc/generator/darkfish.rb') diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index 18394a2c34..e961518fcc 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -698,7 +698,7 @@ class RDoc::Generator::Darkfish out_file.dirname.mkpath out_file.open 'w', 0644 do |io| - io.set_encoding @options.encoding if Object.const_defined? :Encoding + io.set_encoding @options.encoding @context = yield io @@ -744,8 +744,7 @@ class RDoc::Generator::Darkfish erbout = 'io' else template = file.read - template = template.encode @options.encoding if - Object.const_defined? :Encoding + template = template.encode @options.encoding file_var = File.basename(file).sub(/\..*/, '') @@ -758,4 +757,3 @@ class RDoc::Generator::Darkfish end end - -- cgit v1.2.3