akr	2007-12-23 09:07:24 +0900 (Sun, 23 Dec 2007)

  New Revision: 14505

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf.c

  Log:
    ext/nkf/nkf.c follow previous rb_ascii_encoding renaming. 


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14505&r2=14504
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/nkf/nkf.c?r1=14505&r2=14504

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14504)
+++ ChangeLog	(revision 14505)
@@ -1,7 +1,7 @@
-Sun Dec 23 08:42:51 2007  Tanaka Akira  <akr@f...>
+Sun Dec 23 09:07:02 2007  Tanaka Akira  <akr@f...>
 
 	* include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c,
-	  ruby.c, transcode.c: rename rb_ascii_encoding. to
+	  ruby.c, transcode.c, ext/nkf/nkf.c: rename rb_ascii_encoding. to
 	  rb_ascii8bit_encoding.  rb_ascii_encoding is ambiguous with
 	  ASCII-8BIT and US-ASCII.
 
Index: ext/nkf/nkf.c
===================================================================
--- ext/nkf/nkf.c	(revision 14504)
+++ ext/nkf/nkf.c	(revision 14505)
@@ -69,7 +69,7 @@
 	nkf_native_encoding * nkf_base_enc = nkf_enc_to_base_encoding(nkf_enc);
 	idx = rb_enc_find_index(nkf_enc_name(nkf_base_enc));
 	if (idx < 0) {
-	    idx = rb_enc_replicate(name, rb_ascii_encoding());
+	    idx = rb_enc_replicate(name, rb_ascii8bit_encoding());
 	} else {
 	    rb_encoding *rb_enc = rb_enc_from_index(idx);
 	    idx = rb_enc_replicate(name, rb_enc);
@@ -485,7 +485,7 @@
     rb_define_const(mNKF, "NOCONV",	Qnil);
     rb_define_const(mNKF, "UNKNOWN",	Qnil);
     rb_define_const(mNKF, "BINARY",	rb_enc_from_encoding(rb_nkf_enc_get("BINARY")));
-    rb_define_const(mNKF, "ASCII",	rb_enc_from_encoding(rb_ascii_encoding()));
+    rb_define_const(mNKF, "ASCII",	rb_enc_from_encoding(rb_ascii8bit_encoding()));
     rb_define_const(mNKF, "JIS",	rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP")));
     rb_define_const(mNKF, "EUC",	rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP")));
     rb_define_const(mNKF, "SJIS",	rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS")));

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