aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-09 06:17:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-09 06:17:00 +0000
commit2c12deaff4b3ad0b683d9e9fe951e5bf57a952c8 (patch)
treeae906247392b2416af6d840052c6b23e82bbb28d
parent52b6be0ad393508c66bb6d7f4f027985d09f0fd5 (diff)
downloadruby-2c12deaff4b3ad0b683d9e9fe951e5bf57a952c8.tar.gz
encoding.c: fix rdoc of `__FILE__`
* encoding.c (rb_enc_default_internal): fix rdoc. `__FILE__` is in filesystem encoding but not `default_internal`. [ruby-core:61894] [Bug #9713] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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.