nobu	2007-11-09 15:52:02 +0900 (Fri, 09 Nov 2007)

  New Revision: 13852

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
      is no longer in FL_USERS flags.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13852&r2=13851
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=13852&r2=13851

Index: encoding.c
===================================================================
--- encoding.c	(revision 13851)
+++ encoding.c	(revision 13852)
@@ -48,7 +48,6 @@
 VALUE
 rb_enc_from_encoding(rb_encoding *encoding)
 {
-    VALUE enc;
     if (!encoding) return 0;
     if (enc_initialized_p(encoding))
 	return ENC_FROM_ENCODING(encoding);
@@ -63,7 +62,7 @@
 	RDATA(obj)->dmark != enc_mark) {
 	return -1;
     }
-    index = rb_enc_get_index(obj);
+    index = rb_enc_to_index(RDATA(obj)->data);
     if (rb_enc_from_index(index) != RDATA(obj)->data)
 	return -1;
     return index;
@@ -619,8 +618,7 @@
 void
 rb_set_primary_encoding(VALUE encoding)
 {
-    rb_to_encoding(encoding);
-    primary_encoding_index = ENCODING_GET(encoding);
+    primary_encoding_index = rb_enc_to_index(rb_to_encoding(encoding));
 }
 
 static void
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13851)
+++ ChangeLog	(revision 13852)
@@ -1,3 +1,8 @@
+Fri Nov  9 15:52:00 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
+	  is no longer in FL_USERS flags.
+
 Fri Nov  9 15:20:13 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_squeeze_bang): initialize squeezing table if no

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