string.c: rb_str_cat_conv_enc_opts

* file.c (rb_file_expand_path_internal): concatenate converted
  string to the result instead of making converted string and
  append it.
* string.c (rb_str_cat_conv_enc_opts): from rb_str_conv_enc_opts,
  separate function to concatenate with transcoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f337a504df..d9a3c598e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Sat Oct 17 13:55:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): concatenate converted
+	  string to the result instead of making converted string and
+	  append it.
+
+	* string.c (rb_str_cat_conv_enc_opts): from rb_str_conv_enc_opts,
+	  separate function to concatenate with transcoding.
+
+Sat Oct 17 13:55:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): concatenate converted
+	  string to the result instead of making converted string and
+	  append it.
+
+	* string.c (rb_str_cat_conv_enc_opts): from rb_str_conv_enc_opts,
+	  separate function to concatenate with transcoding.
+
 Sat Oct 17 13:19:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (load_file): unify each preparations and clean-ups by