summaryrefslogtreecommitdiff
path: root/ext/nkf
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-03 22:12:03 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-03 22:12:03 +0000
commit464b65b8ea63bc1786697c4c5928a618d9429dc0 (patch)
treeef139103652afeeb2bba317cade0da4f0987b427 /ext/nkf
parentbe8c5a34b5e47c4c894a1bf3be40db8312dd65a1 (diff)
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf')
-rw-r--r--ext/nkf/nkf-utf8/nkf.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 714a1fc44a..128e28e762 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;
}