From 07d1ba775711ee597b4a5b3da93606b7ed6830ff Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 30 Mar 2016 18:41:46 +0000 Subject: * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde. fix indent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/nkf/nkf-utf8/nkf.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5481030c82..b4ac4701eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 31 03:41:02 2016 NARUSE, Yui + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde. + fix indent. + Wed Mar 30 16:33:19 2016 Nobuyoshi Nakada * extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors. diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 2602101561..fd3ce292c2 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -5710,9 +5710,9 @@ module_connection(void) if (nkf_enc_unicode_p(output_encoding)) output_mode = UTF_8; - if (x0201_f == NKF_UNSPECIFIED) { - x0201_f = X0201_DEFAULT; - } + if (x0201_f == NKF_UNSPECIFIED) { + x0201_f = X0201_DEFAULT; + } /* replace continuation module, from output side */ -- cgit v1.2.3