naruse	2016-03-31 03:41:46 +0900 (Thu, 31 Mar 2016)

  New Revision: 54440

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

  Log:
    * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
      fix indent.

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf-utf8/nkf.c
Index: ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ext/nkf/nkf-utf8/nkf.c	(revision 54439)
+++ ext/nkf/nkf-utf8/nkf.c	(revision 54440)
@@ -5710,9 +5710,9 @@ module_connection(void) https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L5710
     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 */
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54439)
+++ ChangeLog	(revision 54440)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Mar 31 03:41:02 2016  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
+	  fix indent.
+
 Wed Mar 30 16:33:19 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.

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