naruse	2015-12-12 23:01:56 +0900 (Sat, 12 Dec 2015)

  New Revision: 53059

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

  Log:
    * ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.

  Modified files:
    trunk/ChangeLog
    trunk/NEWS
    trunk/ext/nkf/nkf-utf8/nkf.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53058)
+++ ChangeLog	(revision 53059)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Dec 12 23:00:17 2015  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.
+
 Sat Dec 12 18:52:26 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* object.c (rb_obj_dig): raise TypeError if an element does not
Index: ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ext/nkf/nkf-utf8/nkf.c	(revision 53058)
+++ ext/nkf/nkf-utf8/nkf.c	(revision 53059)
@@ -20,11 +20,11 @@ https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L20
  *
  * 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 https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L3575
 check_bom(FILE *f)
 {
     int c2;
+    input_bom_f = FALSE;
     switch(c2 = (*i_getc)(f)){
     case 0x00:
 	if((c2 = (*i_getc)(f)) == 0x00){
Index: NEWS
===================================================================
--- NEWS	(revision 53058)
+++ NEWS	(revision 53059)
@@ -192,6 +192,9 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/NEWS#L192
     :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,

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