summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-07-10 19:25:10 +0200
committerBram Moolenaar <Bram@vim.org>2012-07-10 19:25:10 +0200
commitdfef15481db114779fde81dc577319d88557c13a (patch)
tree4e34ac33b32a9a34ef7c32ac0f1cfddffe7830df
parent89af4394091ed4544570676a7de5434cccfd65db (diff)
downloadvim-git-7.3.600.tar.gz
updated for version 7.3.600v7.3.600
Problem: <f-args> is not expanded properly with DBCS encoding. Solution: Skip over character instead of byte. (Yukihiro Nakadaira)
-rw-r--r--src/ex_docmd.c8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index cc80c14b7..7be802c9d 100644
--- 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 9c03d6010..209fa496b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 600,
+/**/
599,
/**/
598,