summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 20afabe261..8b3224034e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,8 @@ Fri Dec 18 16:54:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_set_encoding): add StringIO's own
encoding and separate it from the buffer string to override the
encoding of string when reading. [ruby-core:72189] [Bug #11827]
- note that setting the encoding of its buffer string may cause
- unpredictable behavior.
+ note that setting the encoding of its buffer string directly
+ without StringIO#set_encoding may cause unpredictable behavior.
Fri Dec 18 16:50:35 2015 Koichi Sasada <ko1@atdot.net>
diff --git a/NEWS b/NEWS
index a45d2eba23..c4f444a822 100644
--- a/NEWS
+++ b/NEWS
@@ -242,7 +242,8 @@ with all sufficient information, see the ChangeLog file.
* StringIO
* In read-only mode, StringIO#set_encoding no longer sets the encoding
of its buffer string. Setting the encoding of the string directly
- may cause unpredictable behavior. [Bug #11827]
+ without StringIO#set_encoding may cause unpredictable behavior now.
+ [Bug #11827]
* timeout
* Object#timeout is now warned as deprecated when called.