diff options
| author | ZviRackover <zvirack@gmail.com> | 2018-09-02 01:36:18 +0300 |
|---|---|---|
| committer | ZviRackover <zvirack@gmail.com> | 2018-09-09 10:45:50 +0300 |
| commit | ac13e65ae0ce98516e816ba4fcf468d19e750c30 (patch) | |
| tree | e039a2201ece3358068a659b4bb84b204afd866b /src/nvim/eval.c | |
| parent | cbdbc4f63d68a6b17b9eea5c67130e37d3d0f278 (diff) | |
| download | rneovim-ac13e65ae0ce98516e816ba4fcf468d19e750c30.tar.gz rneovim-ac13e65ae0ce98516e816ba4fcf468d19e750c30.tar.bz2 rneovim-ac13e65ae0ce98516e816ba4fcf468d19e750c30.zip | |
Remove has_mbytes local to lines changed in parent commit
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b56032437b..0a84c26762 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9477,10 +9477,8 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr) temp[i++] = K_SPECIAL; temp[i++] = K_SECOND(n); temp[i++] = K_THIRD(n); - } else if (has_mbyte) + } else i += utf_char2bytes(n, temp + i); - else - temp[i++] = n; temp[i++] = NUL; rettv->v_type = VAR_STRING; rettv->vval.v_string = vim_strsave(temp); @@ -18346,12 +18344,8 @@ void set_vim_var_char(int c) { char buf[MB_MAXBYTES + 1]; - if (has_mbyte) { - buf[utf_char2bytes(c, (char_u *) buf)] = NUL; - } else { - buf[0] = c; - buf[1] = NUL; - } + buf[utf_char2bytes(c, (char_u *) buf)] = NUL; + set_vim_var_string(VV_CHAR, buf, -1); } |