naruse	2013-11-22 14:16:54 +0900 (Fri, 22 Nov 2013)

  New Revision: 43787

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

  Log:
    * ext/nkf: merge nkf 2.1.3 2a2f2c5.

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf-utf8/nkf.c
    trunk/ext/nkf/nkf-utf8/nkf.h
    trunk/ext/nkf/nkf-utf8/utf8tbl.c
    trunk/ext/nkf/nkf-utf8/utf8tbl.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43786)
+++ ChangeLog	(revision 43787)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Nov 22 14:03:00 2013  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf: merge nkf 2.1.3 2a2f2c5.
+
 Fri Nov 22 12:43:52 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* util.c (ruby_strtod): ignore too long fraction part, which does not
Index: ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ext/nkf/nkf-utf8/nkf.c	(revision 43786)
+++ ext/nkf/nkf-utf8/nkf.c	(revision 43787)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L1
 /*
  * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
- * Copyright (c) 1996-2010, The nkf Project.
+ * Copyright (c) 1996-2013, The nkf Project.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,10 +21,10 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L21
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #define NKF_VERSION "2.1.3"
-#define NKF_RELEASE_DATE "2012-11-22"
+#define NKF_RELEASE_DATE "2013-11-22"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2012, The nkf Project."
+    "Copyright (C) 1996-2013, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -6150,9 +6150,10 @@ kanji_convert(FILE *f) https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L6150
 		    }
 		}
 		else {
+		    i_ungetc(c1,f);
 		    /* lonely ESC  */
 		    (*oconv)(0, ESC);
-		    SEND;
+		    SKIP;
 		}
 	    } else if (c1 == ESC && iconv == s_iconv) {
 		/* ESC in Shift_JIS */
@@ -6189,9 +6190,10 @@ kanji_convert(FILE *f) https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L6190
 		    }
 		}
 		else {
+		    i_ungetc(c1,f);
 		    /* lonely ESC  */
 		    (*oconv)(0, ESC);
-		    SEND;
+		    SKIP;
 		}
 	    } else if (c1 == LF || c1 == CR) {
 		if (broken_f&4) {
Index: ext/nkf/nkf-utf8/nkf.h
===================================================================
--- ext/nkf/nkf-utf8/nkf.h	(revision 43786)
+++ ext/nkf/nkf-utf8/nkf.h	(revision 43787)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.h#L1
 /*
- *
+ * 
  * nkf.h - Header file for nkf
- *
+ * 
  */
 
 #ifndef NKF_H
Index: ext/nkf/nkf-utf8/utf8tbl.c
===================================================================
--- ext/nkf/nkf-utf8/utf8tbl.c	(revision 43786)
+++ ext/nkf/nkf-utf8/utf8tbl.c	(revision 43787)
@@ -1,7 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/utf8tbl.c#L1
 /*
  * utf8tbl.c - Convertion Table for nkf
  *
- * $Id$
  */
 
 #include "config.h"
Index: ext/nkf/nkf-utf8/utf8tbl.h
===================================================================
--- ext/nkf/nkf-utf8/utf8tbl.h	(revision 43786)
+++ ext/nkf/nkf-utf8/utf8tbl.h	(revision 43787)
@@ -1,7 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/utf8tbl.h#L1
 /*
  * utf8tbl.h - Header file for Convertion Table
  *
- * $Id: utf8tbl.h,v 1.3 2008/01/23 09:10:25 naruse Exp $
  */
 
 #ifndef _UTF8TBL_H_

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