diff --git a/ChangeLog b/ChangeLog index 3a836c3460..388a865ca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Mar 28 13:42:55 2018 Kazuhiro NISHIYAMA + + [DOC] IO.new accepts external_encoding + + Revert part of r61278 [Bug #13655] + [ci skip] + +Thu Mar 28 13:42:55 2018 NARUSE, Yui + + IO.new doesn't receive "-" as external_encoding [Bug #13655] + Thu Mar 22 15:38:43 2018 NAKAMURA Usaku Removed the obstacle to running test-all with VC14. diff --git a/io.c b/io.c index 524f7d62ef..ef11bda8c6 100644 --- a/io.c +++ b/io.c @@ -7558,8 +7558,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 diff --git a/version.h b/version.h index 9257e54d9b..fdb2e569ab 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #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"