From cc163957a45cc9cadb81d34b630c9f7de79c7892 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 19 Mar 2018 16:27:40 +0000 Subject: [PATCH] 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 --- io.c | 3 +-- version.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/io.c b/io.c index 71ea478ef7..4440418d96 100644 --- a/io.c +++ b/io.c @@ -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 diff --git a/version.h b/version.h index 55c8aaf006..eb60ac93e5 100644 --- a/version.h +++ b/version.h @@ -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