diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-14 17:21:43 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-14 17:23:51 -0500 |
| commit | 87aaa8e837d873577ee6a908a387f40e3548bcb6 (patch) | |
| tree | a68b109b2d9c69be6010d4ace74e9feebab4f262 /src/nvim/change.c | |
| parent | 35874208b86d52b22476ce2a7770b5317fea8694 (diff) | |
| download | rneovim-87aaa8e837d873577ee6a908a387f40e3548bcb6.tar.gz rneovim-87aaa8e837d873577ee6a908a387f40e3548bcb6.tar.bz2 rneovim-87aaa8e837d873577ee6a908a387f40e3548bcb6.zip | |
globals: eliminate "enc_utf8" macro
"enc_utf8" macro evaluates to "true".
Continue dead code removal, started in https://github.com/neovim/neovim/pull/13275.
Diffstat (limited to 'src/nvim/change.c')
| -rw-r--r-- | src/nvim/change.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/change.c b/src/nvim/change.c index 271d350967..0f5081c94c 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -530,12 +530,8 @@ void ins_bytes_len(char_u *p, size_t len) { size_t n; for (size_t i = 0; i < len; i += n) { - if (enc_utf8) { - // avoid reading past p[len] - n = (size_t)utfc_ptr2len_len(p + i, (int)(len - i)); - } else { - n = (size_t)(*mb_ptr2len)(p + i); - } + // avoid reading past p[len] + n = (size_t)utfc_ptr2len_len(p + i, (int)(len - i)); ins_char_bytes(p + i, n); } } @@ -761,7 +757,7 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine) // If 'delcombine' is set and deleting (less than) one character, only // delete the last combining character. - if (p_deco && use_delcombine && enc_utf8 + if (p_deco && use_delcombine && utfc_ptr2len(oldp + col) >= count) { int cc[MAX_MCO]; int n; |