updated for version 7.3.600

Problem:    <f-args> is not expanded properly with DBCS encoding.
Solution:   Skip over character instead of byte. (Yukihiro Nakadaira)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index cc80c14b78faefb006ccbee8b476e4a2fa3f6275..7be802c9d23a9ccfb20520937f570690d74e0bcc 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5845,8 +5845,14 @@ uc_split_args(arg, lenp)
        }
        else
        {
+#ifdef FEAT_MBYTE
+           int charlen = (*mb_ptr2len)(p);
+           len += charlen;
+           p += charlen;
+#else
            ++len;
            ++p;
+#endif
        }
     }
 
@@ -5889,7 +5895,7 @@ uc_split_args(arg, lenp)
        }
        else
        {
-           *q++ = *p++;
+           MB_COPY_CHAR(p, q);
        }
     }
     *q++ = '"';

diff --git a/src/version.c b/src/version.c
index 9c03d601008c8ec04cded8c77cb8947c5d8e1a05..209fa496b602fe91a6ff448f53a223b06b68a6da 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    600,
 /**/
     599,
 /**/