updated for version 7.4.057
Problem: byteidx() does not work for composing characters.
Solution: Add byteidxcomp().
diff --git a/src/eval.c b/src/eval.c
index c3ac467..0468203 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -474,7 +474,9 @@
static void f_bufnr __ARGS((typval_T *argvars, typval_T *rettv));
static void f_bufwinnr __ARGS((typval_T *argvars, typval_T *rettv));
static void f_byte2line __ARGS((typval_T *argvars, typval_T *rettv));
+static void byteidx __ARGS((typval_T *argvars, typval_T *rettv, int comp));
static void f_byteidx __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_byteidxcomp __ARGS((typval_T *argvars, typval_T *rettv));
static void f_call __ARGS((typval_T *argvars, typval_T *rettv));
#ifdef FEAT_FLOAT
static void f_ceil __ARGS((typval_T *argvars, typval_T *rettv));
@@ -7861,6 +7863,7 @@
{"bufwinnr", 1, 1, f_bufwinnr},
{"byte2line", 1, 1, f_byte2line},
{"byteidx", 2, 2, f_byteidx},
+ {"byteidxcomp", 2, 2, f_byteidxcomp},
{"call", 2, 3, f_call},
#ifdef FEAT_FLOAT
{"ceil", 1, 1, f_ceil},
@@ -9177,13 +9180,11 @@
#endif
}
-/*
- * "byteidx()" function
- */
static void
-f_byteidx(argvars, rettv)
+byteidx(argvars, rettv, comp)
typval_T *argvars;
typval_T *rettv;
+ int comp;
{
#ifdef FEAT_MBYTE
char_u *t;
@@ -9203,7 +9204,10 @@
{
if (*t == NUL) /* EOL reached */
return;
- t += (*mb_ptr2len)(t);
+ if (enc_utf8 && comp)
+ t += utf_ptr2len(t);
+ else
+ t += (*mb_ptr2len)(t);
}
rettv->vval.v_number = (varnumber_T)(t - str);
#else
@@ -9212,6 +9216,28 @@
#endif
}
+/*
+ * "byteidx()" function
+ */
+ static void
+f_byteidx(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ byteidx(argvars, rettv, FALSE);
+}
+
+/*
+ * "byteidxcomp()" function
+ */
+ static void
+f_byteidxcomp(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ byteidx(argvars, rettv, TRUE);
+}
+
int
func_call(name, args, selfdict, rettv)
char_u *name;
diff --git a/src/testdir/test69.in b/src/testdir/test69.in
index 9558cb8..f18ee37 100644
--- a/src/testdir/test69.in
+++ b/src/testdir/test69.in
@@ -1,6 +1,7 @@
Test for multi-byte text formatting.
Also test, that 'mps' with multibyte chars works.
And test "ra" on multi-byte characters.
+Also test byteidx() and byteidxcomp()
STARTTEST
:so mbyte.vim
@@ -154,6 +155,21 @@
ａａb
STARTTEST
+:let a = '.é.' " one char of two bytes
+:let b = '.é.' " normal e with composing char
+/^byteidx
+:put =string([byteidx(a, 0), byteidx(a, 1), byteidx(a, 2), byteidx(a, 3), byteidx(a, 4)])
+:put =string([byteidx(b, 0), byteidx(b, 1), byteidx(b, 2), byteidx(b, 3), byteidx(b, 4)])
+/^byteidxcomp
+:put =string([byteidxcomp(a, 0), byteidxcomp(a, 1), byteidxcomp(a, 2), byteidxcomp(a, 3), byteidxcomp(a, 4)])
+:let b = '.é.'
+:put =string([byteidxcomp(b, 0), byteidxcomp(b, 1), byteidxcomp(b, 2), byteidxcomp(b, 3), byteidxcomp(b, 4), byteidxcomp(b, 5)])
+ENDTEST
+
+byteidx
+byteidxcomp
+
+STARTTEST
:g/^STARTTEST/.,/^ENDTEST/d
:1;/^Results/,$wq! test.out
ENDTEST
diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok
index f742ee1..1ff82f2 100644
--- a/src/testdir/test69.ok
+++ b/src/testdir/test69.ok
@@ -149,3 +149,11 @@
aaaa
aaa
+
+byteidx
+[0, 1, 3, 4, -1]
+[0, 1, 4, 5, -1]
+byteidxcomp
+[0, 1, 3, 4, -1]
+[0, 1, 2, 4, 5, -1]
+
diff --git a/src/version.c b/src/version.c
index c682508..d76370f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 57,
+/**/
56,
/**/
55,