diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-26 16:17:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-26 16:17:01 +0000 |
| commit | 21e6862cd5f507b6096e8f738794b18dcff37a8c (patch) | |
| tree | d7d984760287b630f15ba2cda921cc28324813e6 | |
| parent | 8fabd0c551b885f98e23c0d3be175cb317d9d3fd (diff) | |
* encoding.c (enc_find): accept Encoding objects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Apr 27 01:16:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (enc_find): accept Encoding objects. + Wed Apr 27 00:55:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * transcode.c (econv_opts): add newline option. diff --git a/encoding.c b/encoding.c index 272f3ff75d..58497c268b 100644 --- a/encoding.c +++ b/encoding.c @@ -1037,7 +1037,7 @@ enc_list(VALUE klass) static VALUE enc_find(VALUE klass, VALUE enc) { - return rb_enc_from_encoding(to_encoding(enc)); + return rb_enc_from_encoding(rb_to_encoding(enc)); } /* |