summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--encoding.c2
-rw-r--r--version.h4
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 975963f3c7..ae66ff57c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 30 11:35:30 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (rb_filesystem_encoding): Change filesystem_encoding of
+ Mac OS X to UTF-8.
+
Wed Apr 29 21:23:40 2009 NARUSE, Yui <naruse@ruby-lang.org>
* enc/iso_2022_jp.h: add CP50221.
diff --git a/encoding.c b/encoding.c
index ee0f2f4356..0193575711 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1037,7 +1037,7 @@ rb_filesystem_encoding(void)
snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
enc = rb_enc_find(cp);
#elif defined __APPLE__
- enc = rb_enc_find("UTF8-MAC");
+ enc = rb_enc_find("UTF-8");
#else
enc = rb_default_external_encoding();
#endif
diff --git a/version.h b/version.h
index 5bff267968..c76cf7dcb7 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-04-29"
+#define RUBY_RELEASE_DATE "2009-04-30"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];