usa	2018-03-28 13:45:29 +0900 (Wed, 28 Mar 2018)

  New Revision: 62937

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

  Log:
    merge revision(s) 61278,61281: [Backport #13655]
    
    IO.new doesn't recive "-" as external_encoding [Bug #13655]
    
    [DOC] `IO.new` accepts `external_encoding`
    
    Revert part of r61278 [Bug #13655]
    [ci skip]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/io.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62936)
+++ ruby_2_3/ChangeLog	(revision 62937)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Mar 28 13:42:55 2018  Kazuhiro NISHIYAMA  <zn@m...>
+
+	[DOC] IO.new accepts external_encoding
+
+	Revert part of r61278 [Bug #13655]
+	[ci skip]
+
+Thu Mar 28 13:42:55 2018  NARUSE, Yui  <naruse@r...>
+
+	IO.new doesn't receive "-" as external_encoding [Bug #13655]
+
 Thu Mar 22 15:38:43 2018  NAKAMURA Usaku  <usa@r...>
 
 	Removed the obstacle to running test-all with VC14.
Index: ruby_2_3/io.c
===================================================================
--- ruby_2_3/io.c	(revision 62936)
+++ ruby_2_3/io.c	(revision 62937)
@@ -7558,8 +7558,7 @@ rb_io_make_open_file(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/io.c#L7558
  *    If +mode+ parameter is given, this parameter will be bitwise-ORed.
  *
  *  :\external_encoding ::
- *    External encoding for the IO.  "-" is a synonym for the default external
- *    encoding.
+ *    External encoding for the IO.
  *
  *  :\internal_encoding ::
  *    Internal encoding for the IO.  "-" is a synonym for the default internal
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62936)
+++ ruby_2_3/version.h	(revision 62937)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
-#define RUBY_RELEASE_DATE "2018-03-22"
-#define RUBY_PATCHLEVEL 433
+#define RUBY_RELEASE_DATE "2018-03-28"
+#define RUBY_PATCHLEVEL 434
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62936)
+++ ruby_2_3	(revision 62937)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61278,61281

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