mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* encoding.c (rb_enc_find_index): use original encoding name to
load DLL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d8644f632b
commit
f28118eb69
2 changed files with 4 additions and 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.
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue