diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-03 22:12:03 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-03 22:12:03 +0000 |
| commit | 88a2fcedd653eee43271701e2301b7fa622cfea3 (patch) | |
| tree | a91c4c0ef351750070c763115c0ad84ce39f55be | |
| parent | 70ca97cf02526d4bdc270617e68dc02ba5848427 (diff) | |
| download | ruby-88a2fcedd653eee43271701e2301b7fa622cfea3.tar.gz ruby-88a2fcedd653eee43271701e2301b7fa622cfea3.tar.xz ruby-88a2fcedd653eee43271701e2301b7fa622cfea3.zip | |
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 9 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Mar 4 07:07:00 2005 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63 + Thu Mar 3 23:24:00 2005 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62 diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 714a1fc44..128e28e76 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -41,7 +41,7 @@ ***********************************************************************/ /* $Id$ */ #define NKF_VERSION "2.0.4" -#define NKF_RELEASE_DATE "2005-02-20" +#define NKF_RELEASE_DATE "2005-03-04" #include "config.h" static char *CopyRight = @@ -2197,6 +2197,13 @@ kanji_convert(f) /* epilogue */ (*iconv)(EOF, 0, 0); + if (!is_inputcode_set) + set_input_codename( + iconv == e_iconv ? "EUC-JP" : + iconv == s_iconv ? "Shift_JIS" : + iconv == w_iconv ? "UTF-8" : + iconv == w_iconv16 ? "UTF-16" : + "ASCII"); return 1; } |