1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-19 16:27:40 +00:00
parent 3e00a2d7b5
commit cc163957a4
2 changed files with 2 additions and 3 deletions

3
io.c
View file

@ -7644,8 +7644,7 @@ rb_io_make_open_file(VALUE obj)
* 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

View file

@ -1,6 +1,6 @@
#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