From cde7c409825440bad9b177c72524cd5803dabc4f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 5 Feb 2009 00:38:22 +0000 Subject: merge revision(s) 20142: * ext/nkf/nkf-utf8/nkf.c (h_conv): can't guess UTF-8 input in conversion. [ruby-list:45609] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/nkf/nkf-utf8/nkf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 3cd1b160da..9a31c9d879 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -41,13 +41,13 @@ ***********************************************************************/ /* $Id$ */ #define NKF_VERSION "2.0.8" -#define NKF_RELEASE_DATE "2007-01-28" +#define NKF_RELEASE_DATE "2008-11-08" #include "config.h" #include "utf8tbl.h" #define COPY_RIGHT \ "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \ - "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon" + "Copyright (C) 2002-2008 Kono, Furukawa, Naruse, mastodon" /* @@ -3025,12 +3025,12 @@ h_conv(FILE *f, nkf_char c2, nkf_char c1) code_status(c1); } while (p->name){ - if (p->score < result->score){ + if (p->status_func && p->score < result->score){ result = p; } ++p; } - set_iconv(FALSE, result->iconv_func); + set_iconv(TRUE, result->iconv_func); } -- cgit v1.2.3