archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 61278,61281: [Backport #13655]

Browse source 
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_3@62937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-03-28 04:45:29 +00:00
parent 889afb8bed
commit b24443d37d
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Thu Mar 28 13:42:55 2018 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
[DOC] IO.new accepts external_encoding
Revert part of r61278 [Bug #13655]
[ci skip]
Thu Mar 28 13:42:55 2018 NARUSE, Yui <naruse@ruby-lang.org>
IO.new doesn't receive "-" as external_encoding [Bug #13655]
Thu Mar 22 15:38:43 2018 NAKAMURA Usaku <usa@ruby-lang.org> Thu Mar 22 15:38:43 2018 NAKAMURA Usaku <usa@ruby-lang.org>
Removed the obstacle to running test-all with VC14. Removed the obstacle to running test-all with VC14.

3
io.c
View file

@ -7558,8 +7558,7 @@ rb_io_make_open_file(VALUE obj)
* If +mode+ parameter is given, this parameter will be bitwise-ORed. * If +mode+ parameter is given, this parameter will be bitwise-ORed.
* *
* :\external_encoding :: * :\external_encoding ::
* External encoding for the IO. "-" is a synonym for the default external * External encoding for the IO.
* encoding.
* *
* :\internal_encoding :: * :\internal_encoding ::
* Internal encoding for the IO. "-" is a synonym for the default internal * Internal encoding for the IO. "-" is a synonym for the default internal

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.7" #define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-22" #define RUBY_RELEASE_DATE "2018-03-28"
#define RUBY_PATCHLEVEL 433 #define RUBY_PATCHLEVEL 434
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 22 #define RUBY_RELEASE_DAY 28
#include "ruby/version.h" #include "ruby/version.h"