naruse	2009-08-12 07:39:54 +0900 (Wed, 12 Aug 2009)

  New Revision: 24505

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24505

  Log:
    * encoding.c (is_data_encoding): fix condition.
    * encoding.c (enc_capable): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 24504)
+++ encoding.c	(revision 24505)
@@ -62,7 +62,7 @@
     "encoding", 0, 0, enc_memsize,
 };
 
-#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) != &encoding_data_type)
+#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
 
 static VALUE
 enc_new(rb_encoding *encoding)
@@ -585,7 +585,7 @@
       case T_FILE:
 	return TRUE;
       case T_DATA:
-	if (!is_data_encoding(obj)) return TRUE;
+	if (is_data_encoding(obj)) return TRUE;
       default:
 	return FALSE;
     }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24504)
+++ ChangeLog	(revision 24505)
@@ -1,3 +1,9 @@
+Wed Aug 12 07:38:12 2009  NARUSE, Yui  <naruse@r...>
+
+	* encoding.c (is_data_encoding): fix condition.
+
+	* encoding.c (enc_capable): ditto.
+
 Tue Aug 11 23:12:31 2009  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date.rb (complete_frags): Monday must be suitable for %W's

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/