diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-29 08:40:40 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-29 08:40:40 +0000 |
commit | d3fb88d09aea446e670eeab9864b333b22332451 (patch) | |
tree | 3e2fc873e8d25271f1a7e6f3f23635db112b55b3 /ChangeLog | |
parent | 4a4a83c981b1f51f625073fbd63f8dc8a9f53044 (diff) |
merge revision(s) 51820: [Backport #11519]
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
encoding beginning with an interpolation same as the source file
encoding. [ruby-core:70703] [Bug #11519]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Tue Sep 29 17:39:42 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (literal_concat_gen, evstr2dstr_gen): keep literal + encoding beginning with an interpolation same as the source file + encoding. [ruby-core:70703] [Bug #11519] + Tue Sep 29 17:33:13 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction |