diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-03-11 12:11:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-03-11 12:11:02 +0000 |
| commit | 5d294d19b4cae252633bd10e9f32b47f5692d227 (patch) | |
| tree | 5d88b7eacd8e4194ced628260eebbdd04637ebea | |
| parent | 21fa1ed4b517940d312994dcdd703cf6e20f152a (diff) | |
| download | vim-git-5d294d19b4cae252633bd10e9f32b47f5692d227.tar.gz | |
updated for version 7.2-134v7.2.134
| -rw-r--r-- | src/fileio.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index 342cf590a..0d0269b7f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5288,13 +5288,16 @@ buf_write_bytes(ip) /* Convert with iconv(). */ if (ip->bw_restlen > 0) { + char *fp; + /* Need to concatenate the remainder of the previous call and * the bytes of the current call. Use the end of the * conversion buffer for this. */ fromlen = len + ip->bw_restlen; - from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; - mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen); - mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len); + fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; + mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen); + mch_memmove(fp + ip->bw_restlen, buf, (size_t)len); + from = fp; tolen = ip->bw_conv_buflen - fromlen; } else diff --git a/src/version.c b/src/version.c index bce02a7b7..c404e1439 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 134, +/**/ 133, /**/ 132, |