diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-07 16:54:25 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-07 16:54:25 +0000 |
| commit | ef1e9185f4d05fbc27be3946def78e77c9ec0f15 (patch) | |
| tree | 33026b872d5d473681a9c60f1eceb958f4321b1f | |
| parent | 594e65037dead6fa8e23796153ae8d9029579756 (diff) | |
* 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@20142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sat Nov 8 01:38:07 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (h_conv): can't guess UTF-8 input in + conversion. [ruby-list:45609] + Fri Nov 7 18:29:09 2008 Akinori MUSHA <knu@iDaemons.org> * hash.c (rb_hash_key, env_key): Hash#index is renamed to diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 158a8ed5e9..173cef84e4 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); } |