diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-02 23:29:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-02 23:29:26 +0100 |
| commit | 0ffbbf9ea871dd64c2be933d6718f0b34fe960c4 (patch) | |
| tree | cc8d2df9e03eca6b8a9c20f4c6f821c4f32525b2 /src/eval.c | |
| parent | 4cc95d1495706593d30ce2fae3fc592a2ffdaab8 (diff) | |
| download | vim-git-0ffbbf9ea871dd64c2be933d6718f0b34fe960c4.tar.gz | |
updated for version 7.4.057v7.4.057
Problem: byteidx() does not work for composing characters.
Solution: Add byteidxcomp().
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c index c3ac4673d..0468203cc 100644 --- a/src/eval.c +++ b/src/eval.c @@ -474,7 +474,9 @@ static void f_bufname __ARGS((typval_T *argvars, typval_T *rettv)); 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 @@ static struct fst {"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 @@ f_byte2line(argvars, rettv) #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 @@ f_byteidx(argvars, rettv) { 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 @@ f_byteidx(argvars, rettv) #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; |