diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-01 15:22:25 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-01 15:22:25 +0000 |
commit | 7d847f7c377b6dbf85371c3e03599881b76f1954 (patch) | |
tree | 620178b6bee52e11f5ba2790031123443aecbb33 /ext/nkf/nkf.c | |
parent | 5f41f87d2ba568cb0ad1fdb523a4c60b15a40613 (diff) | |
download | ruby-7d847f7c377b6dbf85371c3e03599881b76f1954.tar.gz |
* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: Update nkf.
* ext/nkf/nkf.c: fix documents.
* ext/nkf/lib/kconv.rb: fix documents.
(Kconv.is*): use valid_encoding?.
(Kconv.isjis): defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf/nkf.c')
-rw-r--r-- | ext/nkf/nkf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 703315834e..b720198cf2 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -66,8 +66,7 @@ rb_encoding* rb_nkf_enc_get(const char *name) int idx = rb_enc_find_index(name); if (idx < 0) { nkf_encoding *nkf_enc = nkf_enc_find(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)); + idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc))); if (idx < 0) { idx = rb_define_dummy_encoding(name); } else { @@ -127,7 +126,7 @@ int nkf_split_options(const char *arg) /* * call-seq: - * NKF.nkf(opt, str) -> string + * NKF.nkf(opt, str) => string * * Convert _str_ and return converted result. * Conversion details are specified by _opt_ as String. @@ -176,7 +175,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src) /* * call-seq: - * NKF.guess(str) -> encoding + * NKF.guess(str) => encoding * * Returns guessed encoding of _str_ by nkf routine. * @@ -402,7 +401,7 @@ rb_nkf_guess(VALUE obj, VALUE src) * * [Shift_JIS] SJIS, MS-Kanji * - * [CP932] a.k.a. Windows-31J + * [Windows-31J] a.k.a. CP932 * * [UTF-8] same as UTF-8N * |