summaryrefslogtreecommitdiff
path: root/encoding.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-10 06:50:33 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-10 06:50:33 +0000
commitee624f97ac3560abfe55e6d8ba88bb38a4016180 (patch)
tree9bf7acc50fefc01abec3f932cb10576ce82888ea /encoding.c
parent8c19ecbeeb846e254df520b9e339c36a42277ceb (diff)
* encoding.c (rb_enc_init): don't alias iso-8859-1 to ascii.
* ascii.c (OnigEncodingASCII): change the name US-ASCII to ASCII-8BIT. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/encoding.c b/encoding.c
index 5b0450f190..bee7957e6e 100644
--- a/encoding.c
+++ b/encoding.c
@@ -75,10 +75,10 @@ rb_enc_init(void)
ENC_REGISTER(ONIG_ENCODING_SJIS);
ENC_REGISTER(ONIG_ENCODING_UTF8);
#undef ENC_REGISTER
- rb_enc_alias("ascii", "us-ascii");
- rb_enc_alias("binary", "us-ascii");
- rb_enc_alias("iso-8859-1", "us-ascii");
- rb_enc_alias("sjis", "shift_jis");
+ rb_enc_alias("ascii", rb_enc_name(ONIG_ENCODING_ASCII));
+ rb_enc_alias("binary", rb_enc_name(ONIG_ENCODING_ASCII));
+ rb_enc_alias("us-ascii", rb_enc_name(ONIG_ENCODING_ASCII)); /* will be defined separately in future. */
+ rb_enc_alias("sjis", rb_enc_name(ONIG_ENCODING_SJIS));
}
rb_encoding *