[ruby-cvs:65346] nagachika:r58175 (ruby_2_3): merge revision(s) 57302, 57303, 57304: [Backport #13119]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Tue Mar 28 01:37:09 JST 2017


nagachika	2017-03-28 01:37:09 +0900 (Tue, 28 Mar 2017)

  New Revision: 58175

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58175

  Log:
    merge revision(s) 57302,57303,57304: [Backport #13119]
    
    string.c: block for scrub with ASCII-incompatible
    
    * string.c (rb_enc_str_scrub): honor the given block with
      ASCII-incompatible encoding.  [ruby-core:79039] [Bug #13120]
    string.c: yield invalid part
    
    * string.c (rb_enc_str_scrub): yield the invalid part only with
      ASCII-incompatible.  [ruby-core:79039] [Bug #13120]
    string.c: replacement and block
    
    * string.c (rb_enc_str_scrub): only one of replacement and block
      is allowed.  [ruby-core:79038] [Bug #13119]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/string.c
    branches/ruby_2_3/test/ruby/test_m17n.rb
    branches/ruby_2_3/version.h


More information about the ruby-cvs mailing list