updated for version 7.2-134

diff --git a/src/fileio.c b/src/fileio.c
index 342cf590ab50e1bdc287f4a6cab5d9fa46374354..0d0269b7fbb76d2d4111504b2a708fcdb0e45028 100644 (file)
--- 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 bce02a7b725bebb623d3de34db334a5bf793b348..c404e14392c9f0b14e0744c885c1286c3721f1af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    134,
 /**/
     133,
 /**/