diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 01:37:27 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 01:37:27 +0000 |
| commit | 06ce0e2da4079460bd3a5e94034d1f0cde1e767f (patch) | |
| tree | 21d11f27b6cdcced635f8efcb7a741757d4cd748 | |
| parent | 9659fd32b550a642991a196bff215e998e22ded8 (diff) | |
| download | ruby-06ce0e2da4079460bd3a5e94034d1f0cde1e767f.tar.gz ruby-06ce0e2da4079460bd3a5e94034d1f0cde1e767f.tar.xz ruby-06ce0e2da4079460bd3a5e94034d1f0cde1e767f.zip | |
* encoding.c (rb_enc_find_index): use original encoding name to
load DLL.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -19,6 +19,9 @@ Fri Jan 18 09:22:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * encoding.c (rb_enc_aliases_enc_i): exclude non alias names from Encoding.aliases. + * encoding.c (rb_enc_find_index): use original encoding name to + load DLL. + Fri Jan 18 07:06:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (Init_IO): stdin/stdout may not be duplex. diff --git a/encoding.c b/encoding.c index 07a1f8bfc..505aaa9dc 100644 --- a/encoding.c +++ b/encoding.c @@ -497,7 +497,7 @@ rb_enc_find_index(const char *name) enc_register_at(i, name, rb_enc_from_index(b)); } else { - i = load_encoding(name); + i = load_encoding(rb_enc_name(enc)); if (enc_autoload_p(rb_enc_from_index(i))) { rb_warn("failed to load encoding (%s); use ASCII-8BIT instead", name); |