summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--encoding.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8ace75b2f..6fc369454a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 29 04:14:08 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (rb_filesystem_encoding): On Unix systems,
+ filesystem encoding should be locale encoding.
+ [ruby-dev:39393]
+
Tue Sep 29 04:07:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
* hash.c (rb_f_getenv): use rb_filesystem_str_new_cstr
diff --git a/encoding.c b/encoding.c
index a7594aa378..c8fa8ee5ed 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1104,7 +1104,7 @@ rb_filesystem_encoding(void)
#elif defined __APPLE__
enc = rb_utf8_encoding();
#else
- enc = rb_default_external_encoding();
+ enc = rb_locale_encoding();
#endif
return enc;
}