nagachika	2018-03-20 01:27:40 +0900 (Tue, 20 Mar 2018)

  New Revision: 62846

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

  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_4/
  Modified files:
    branches/ruby_2_4/io.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/io.c
===================================================================
--- ruby_2_4/io.c	(revision 62845)
+++ ruby_2_4/io.c	(revision 62846)
@@ -7644,8 +7644,7 @@ rb_io_make_open_file(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7644
  *    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_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62845)
+++ ruby_2_4/version.h	(revision 62846)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
 #define RUBY_RELEASE_DATE "2018-03-20"
-#define RUBY_PATCHLEVEL 265
+#define RUBY_PATCHLEVEL 266
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62845)
+++ ruby_2_4	(revision 62846)

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

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