aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--miniinit.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a16071418b..0b85787eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 26 11:26:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * miniinit.c (Init_enc): add some common aliases of built-in
+ encodings. [ruby-core:72481] [Bug #11872]
+
Sat Dec 26 01:24:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, version.h (RUBY_PROGRAM_VERSION): extract version
diff --git a/miniinit.c b/miniinit.c
index b4bc4dd437..7284e2e62d 100644
--- a/miniinit.c
+++ b/miniinit.c
@@ -36,11 +36,14 @@ Init_enc_set_filesystem_encoding(void)
return rb_enc_to_index(rb_default_external_encoding());
}
+void rb_encdb_declare(const char *name);
+int rb_encdb_alias(const char *alias, const char *orig);
void
Init_enc(void)
{
- void rb_encdb_declare(const char *name);
rb_encdb_declare("ASCII-8BIT");
rb_encdb_declare("US-ASCII");
rb_encdb_declare("UTF-8");
+ rb_encdb_alias("BINARY", "ASCII-8BIT");
+ rb_encdb_alias("ASCII", "US-ASCII");
}