diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-30 18:41:46 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-30 18:41:46 +0000 |
commit | c77c8b8e28106cea9a453200b7ab04409de81ba0 (patch) | |
tree | b22d20aab36d664a7742343271a9bcfc9c6b2053 | |
parent | 677f327acf9c17fd63d333d3796985669bc588f4 (diff) | |
download | ruby-c77c8b8e28106cea9a453200b7ab04409de81ba0.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Mar 31 03:41:02 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde. + fix indent. + Wed Mar 30 16:33:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 */ |