shyouhei	2009-02-05 09:39:09 +0900 (Thu, 05 Feb 2009)

  New Revision: 22067

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22067

  Log:
    merge revision(s) 20142:
    * ext/nkf/nkf-utf8/nkf.c (h_conv): can't guess UTF-8 input in
      conversion. [ruby-list:45609]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c	(revision 22066)
+++ ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c	(revision 22067)
@@ -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 @@
             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);
     }
 
 
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22066)
+++ ruby_1_8_7/ChangeLog	(revision 22067)
@@ -1,3 +1,8 @@
+Thu Feb  5 09:38:48 2009  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* lib/rexml/entity.rb (unnormalized): do not call
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22066)
+++ ruby_1_8_7/version.h	(revision 22067)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/