summaryrefslogtreecommitdiff
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
commit076d6dfc8a674ac1edfac90078c5d44661d64c1b (patch)
treea91c4c0ef351750070c763115c0ad84ce39f55be
parente5d5c0d8fcc309fe84fc9f3b9ad9945ef74b06fb (diff)
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/nkf/nkf-utf8/nkf.c9
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c289db6626..dc63297563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 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;
}