summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-05 00:38:22 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-05 00:38:22 +0000
commitcde7c409825440bad9b177c72524cd5803dabc4f (patch)
tree8eca398ef4a61f12d0c02f2a91a74ed8f6256393
parent284dc8effcf9914e944a3f386a38b49b56a8012d (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_6@22065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/nkf-utf8/nkf.c8
-rw-r--r--version.h2
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 784fe14..c23ae20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 5 09:37:39 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:02:18 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 3cd1b16..9a31c9d 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);
}
diff --git a/version.h b/version.h
index db19a45..f84a234 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-05"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090205
-#define RUBY_PATCHLEVEL 321
+#define RUBY_PATCHLEVEL 322
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8