mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-134
This commit is contained in:
parent
21fa1ed4b5
commit
5d294d19b4
@ -5288,13 +5288,16 @@ buf_write_bytes(ip)
|
|||||||
/* Convert with iconv(). */
|
/* Convert with iconv(). */
|
||||||
if (ip->bw_restlen > 0)
|
if (ip->bw_restlen > 0)
|
||||||
{
|
{
|
||||||
|
char *fp;
|
||||||
|
|
||||||
/* Need to concatenate the remainder of the previous call and
|
/* Need to concatenate the remainder of the previous call and
|
||||||
* the bytes of the current call. Use the end of the
|
* the bytes of the current call. Use the end of the
|
||||||
* conversion buffer for this. */
|
* conversion buffer for this. */
|
||||||
fromlen = len + ip->bw_restlen;
|
fromlen = len + ip->bw_restlen;
|
||||||
from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
|
fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
|
||||||
mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen);
|
mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen);
|
||||||
mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len);
|
mch_memmove(fp + ip->bw_restlen, buf, (size_t)len);
|
||||||
|
from = fp;
|
||||||
tolen = ip->bw_conv_buflen - fromlen;
|
tolen = ip->bw_conv_buflen - fromlen;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -676,6 +676,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
134,
|
||||||
/**/
|
/**/
|
||||||
133,
|
133,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user