vim-patch:7.4.323 #967

Problem:    Substitute() with zero width pattern breaks multi-byte character.
Solution:   Take multi-byte character size into account. (Yukihiro Nakadaira)

https://code.google.com/p/vim/source/detail?r=238f5027830cad22e17a970483af9b160869cdf3
This commit is contained in:
André Twupack
2014-07-20 12:11:18 +02:00
committed by Justin M. Keyes
parent 69497ad10a
commit cb809069a8
4 changed files with 16 additions and 3 deletions

View File

@@ -18996,8 +18996,10 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags)
if (regmatch.startp[0] == regmatch.endp[0]) {
if (zero_width == regmatch.startp[0]) {
/* avoid getting stuck on a match with an empty string */
*((char_u *)ga.ga_data + ga.ga_len) = *tail++;
++ga.ga_len;
int i = MB_PTR2LEN(tail);
memmove((char_u *)ga.ga_data + ga.ga_len, tail, (size_t)i);
ga.ga_len += i;
tail += i;
continue;
}
zero_width = regmatch.startp[0];