[ruby-cvs:65262] usa:r58091 (ruby_2_2): merge revision(s) 57302, 57303, 57304: [Backport #13119]

usa at ruby-lang.org usa at ruby-lang.org
Sun Mar 26 00:36:01 JST 2017


usa	2017-03-26 00:36:01 +0900 (Sun, 26 Mar 2017)

  New Revision: 58091

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

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


More information about the ruby-cvs mailing list