diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 00:39:09 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-05 00:39:09 +0000 |
commit | d17f8b06df2a4028898839acd6cfc88508a2f2ff (patch) | |
tree | 0f3d40f93e3fe38398d10db8ebd3cdc357f398d6 | |
parent | 1323a6e45c5128c864a074483f67dec43f84ba00 (diff) |
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_7@22067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 8 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Feb 5 09:38:48 2009 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] + Thu Feb 5 09:03:21 2009 Shugo Maeda <shugo@ruby-lang.org> * lib/rexml/entity.rb (unnormalized): do not call 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); } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-05" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090205 -#define RUBY_PATCHLEVEL 107 +#define RUBY_PATCHLEVEL 108 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |