[ruby-cvs:65021] naruse:r57855 (ruby_2_4): merge revision(s) 57302, 57303, 57304: [Backport #13119]

naruse at ruby-lang.org naruse at ruby-lang.org
Sun Mar 12 01:38:54 JST 2017


naruse	2017-03-12 01:38:53 +0900 (Sun, 12 Mar 2017)

  New Revision: 57855

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

  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_4/
  Modified files:
    branches/ruby_2_4/string.c
    branches/ruby_2_4/test/ruby/test_m17n.rb
    branches/ruby_2_4/version.h


More information about the ruby-cvs mailing list