summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--encoding.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 609bc7b0e3..061aaa71ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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));
}
/*