From 7fe3c2665ef9ba43b4368068be6c19af0b9be43e Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 12 Dec 2015 14:01:56 +0000 Subject: * 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 --- ext/nkf/nkf-utf8/nkf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ext/nkf/nkf-utf8') 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){ -- cgit v1.2.3