aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-10 12:28:13 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-10 12:28:13 +0000
commita31507939004778e39af5da92bcd6b295b86c11d (patch)
treeff9e9ef45c112a25cec8ef35c196f3909d30245c
parent1325437297539bf433904b64db63a3186e62177e (diff)
downloadruby-a31507939004778e39af5da92bcd6b295b86c11d.tar.gz
* lib/rdoc/markup/preprocess.rb (RDoc::Markup::PreProcess#handle):
use File.binread to avoid locale dependency. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/markup/preprocess.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abc1f744f9..0865985a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 10 21:26:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rdoc/markup/preprocess.rb (RDoc::Markup::PreProcess#handle):
+ use File.binread to avoid locale dependency.
+
Sat Apr 10 15:18:26 2010 Eric Hodel <drbrain@segment7.net>
* lib/rdoc: Import RDoc 2.5.2
diff --git a/lib/rdoc/markup/preprocess.rb b/lib/rdoc/markup/preprocess.rb
index 7aac9df74a..b48f099119 100644
--- a/lib/rdoc/markup/preprocess.rb
+++ b/lib/rdoc/markup/preprocess.rb
@@ -46,7 +46,7 @@ class RDoc::Markup::PreProcess
def include_file(name, indent)
if full_name = find_include_file(name) then
- content = File.read full_name
+ content = File.binread full_name
content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
# strip leading '#'s, but only if all lines start with them