diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 12 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.h | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/utf8tbl.c | 1 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/utf8tbl.h | 1 |
5 files changed, 13 insertions, 9 deletions
@@ -1,3 +1,7 @@ +Fri Nov 22 14:03:00 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf: merge nkf 2.1.3 2a2f2c5. + Fri Nov 22 12:43:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * util.c (ruby_strtod): ignore too long fraction part, which does not diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 8e9d206471..ca3e438220 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -1,6 +1,6 @@ /* * 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 @@ * 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) } } 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) } } else { + i_ungetc(c1,f); /* lonely ESC */ (*oconv)(0, ESC); - SEND; + SKIP; } } else if (c1 == LF || c1 == CR) { if (broken_f&4) { diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h index cd3037601b..af44320f90 100644 --- a/ext/nkf/nkf-utf8/nkf.h +++ b/ext/nkf/nkf-utf8/nkf.h @@ -1,7 +1,7 @@ /* - * + * * nkf.h - Header file for nkf - * + * */ #ifndef NKF_H diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c index bbf5c5f109..e493c6beb5 100644 --- a/ext/nkf/nkf-utf8/utf8tbl.c +++ b/ext/nkf/nkf-utf8/utf8tbl.c @@ -1,7 +1,6 @@ /* * utf8tbl.c - Convertion Table for nkf * - * $Id$ */ #include "config.h" diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h index 082fb01a5b..96b61ed5a4 100644 --- a/ext/nkf/nkf-utf8/utf8tbl.h +++ b/ext/nkf/nkf-utf8/utf8tbl.h @@ -1,7 +1,6 @@ /* * utf8tbl.h - Header file for Convertion Table * - * $Id: utf8tbl.h,v 1.3 2008/01/23 09:10:25 naruse Exp $ */ #ifndef _UTF8TBL_H_ |