From 7fe3c2665ef9ba43b4368068be6c19af0b9be43e Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 12 Dec 2015 14:01:56 +0000
Subject: [PATCH] * ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              | 4 ++++
 NEWS                   | 3 +++
 ext/nkf/nkf-utf8/nkf.c | 7 ++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24c6511623..70a0ac3c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 12 23:00:17 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.
+
 Sat Dec 12 18:52:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_obj_dig): raise TypeError if an element does not
diff --git a/NEWS b/NEWS
index 5299bf8909..efd2383615 100644
--- a/NEWS
+++ b/NEWS
@@ -192,6 +192,9 @@ with all sufficient information, see the ChangeLog file.
     :warn, :error, :fatal (case insensitive) [Feature #11695]
   * Logger#reopen is added to reopen a log device. [Feature #11696]
 
+* nkf
+  * Merge nkf 2.1.4.
+
 * Socket
   * Socket#connect_nonblock, Socket#accept_nonblock,
     TCPServer#accept_nonblock, UNIXServer#accept_nonblock,
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 236e5da54d..6cdb026341 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.3"
-#define NKF_RELEASE_DATE "2013-11-22"
+#define NKF_VERSION "2.1.4"
+#define NKF_RELEASE_DATE "2015-12-12"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2013, The nkf Project."
+    "Copyright (C) 1996-2015, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -3575,6 +3575,7 @@ static void
 check_bom(FILE *f)
 {
     int c2;
+    input_bom_f = FALSE;
     switch(c2 = (*i_getc)(f)){
     case 0x00:
 	if((c2 = (*i_getc)(f)) == 0x00){