diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 02:39:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 02:39:12 +0000 |
| commit | 570c99433c6ebd746f6e2df094a8f1fe22ac87ff (patch) | |
| tree | f49f004607a91e9a58a48626ab531973f6130cd7 /encoding.c | |
| parent | 06ce0e2da4079460bd3a5e94034d1f0cde1e767f (diff) | |
| download | ruby-570c99433c6ebd746f6e2df094a8f1fe22ac87ff.tar.gz ruby-570c99433c6ebd746f6e2df094a8f1fe22ac87ff.tar.xz ruby-570c99433c6ebd746f6e2df094a8f1fe22ac87ff.zip | |
* encoding.c (rb_enc_find_index): use original encoding name to
replicate loaded encoding instead alias.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 505aaa9dc..c713a3060 100644 --- a/encoding.c +++ b/encoding.c @@ -487,14 +487,16 @@ rb_enc_find_index(const char *name) if (enc_initialized_p(enc) && (base = enc_base_encoding(ENC_FROM_ENCODING(enc)), !NIL_P(base))) { if ((b = enc_check_encoding(base)) < 0) { +#if 0 st_data_t key, val; key = (st_data_t)name; if (st_delete(enc_table.names, &key, &val)) { if (enc->name != (char *)key) xfree((char *)key); } +#endif return -1; } - enc_register_at(i, name, rb_enc_from_index(b)); + enc_register_at(i, rb_enc_name(enc), rb_enc_from_index(b)); } else { i = load_encoding(rb_enc_name(enc)); |