summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 16:28:45 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 16:28:45 +0000
commit7ee205d1d1b273fa660ff35ce08544d5c3a3b9df (patch)
tree552062c243d812225137a3e3d6cd2a78393b958c
parent07c730fcbc3fa1e4cbb7ee0a78ed28d3204026dd (diff)
* lib/rdoc/rdoc.rb (parse_files): don't depend on the default external
encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/rdoc.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 44d2ac9cd0..f3d15cd303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 28 01:27:47 2007 Tanaka Akira <akr@fsij.org>
+
+ * lib/rdoc/rdoc.rb (parse_files): don't depend on the default external
+ encoding.
+
Fri Dec 28 00:01:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (golf_prelude.c): use MINIRUBY instead of BASERUBY because
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 51038a1652..f93d9c9606 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -219,7 +219,7 @@ module RDoc
file_list.each do |fn|
$stderr.printf("\n%35s: ", File.basename(fn)) unless options.quiet
- content = File.open(fn, "r") {|f| f.read}
+ content = File.open(fn, "r:ascii-8bit") {|f| f.read}
if /coding:\s*(\S+)/ =~ content[/\A(?:.*\n){0,2}/]
if enc = Encoding.find($1)
content.force_encoding(enc)