diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 09:37:51 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 09:37:51 +0000 |
| commit | 03a1e25542345e6e4b40864a27d62d11df700047 (patch) | |
| tree | f5f0464ce68837cdef32a59bd7c28e61eceebd09 /ext/nkf/nkf.c | |
| parent | 6c6f996d71d45a16adc50e768034dbb3971a2586 (diff) | |
| download | ruby-03a1e25542345e6e4b40864a27d62d11df700047.tar.gz | |
* ext/nkf/nkf.c (rb_nkf_enc_get): use rb_define_dummy_encoding.
* ext/nkf/nkf.c (Init_nkf): use rb_nkf_enc_get("ASCII").
* ext/nkf/nkf-utf8/nkf.c: Update 1.161.
* ext/nkf/nkf-utf9/config.h: default output encoding is now UTF-8.
* ext/nkf/lib/kconv.rb (Kconv.kconv): replace Encoding#name by
Encoding#to_s.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf/nkf.c')
| -rw-r--r-- | ext/nkf/nkf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index d4afb84a38..703315834e 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -69,7 +69,7 @@ rb_encoding* rb_nkf_enc_get(const char *name) 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_ascii8bit_encoding()); + idx = rb_define_dummy_encoding(name); } else { rb_encoding *rb_enc = rb_enc_from_index(idx); idx = rb_enc_replicate(name, rb_enc); @@ -485,7 +485,7 @@ Init_nkf() 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_ascii8bit_encoding())); + rb_define_const(mNKF, "ASCII", rb_enc_from_encoding(rb_nkf_enc_get("ASCII"))); 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"))); |