aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--encoding.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a09cb768de..fb548c31b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 9 15:16:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (rb_enc_default_internal): fix rdoc. `__FILE__` is
+ in filesystem encoding but not `default_internal`.
+ [ruby-core:61894] [Bug #9713]
+
Wed Apr 9 14:43:00 2014 Koichi Sasada <ko1@atdot.net>
* test/ruby/test_gc.rb: more long timeout.
diff --git a/encoding.c b/encoding.c
index df3d65cd48..1eaf55339f 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1470,7 +1470,6 @@ rb_enc_default_internal(void)
* * Time#zone
* * Values from ENV
* * Values in ARGV including $PROGRAM_NAME
- * * __FILE__
*
* Additionally String#encode and String#encode! use the default internal
* encoding if no encoding is given.