diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:43:04 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:43:04 +0200 |
commit | 461d46d8ace1b6950bf2733de9cb2b290453d86d (patch) | |
tree | a592acf9f95e8c60cc396f48ac4bf73656c0846c /src/nvim/memline.c | |
parent | 885ca3b7a60b79feb1d4c9e54265c8b543d4f245 (diff) | |
parent | a2403a0ed9afdfaea7abb5555dbdf555b56eff9a (diff) | |
download | rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.tar.gz rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.tar.bz2 rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.zip |
Merge #8863 'refactor: Remove mb_head_off()'
Diffstat (limited to 'src/nvim/memline.c')
-rw-r--r-- | src/nvim/memline.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index fbd376641f..61d944eb75 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -4035,24 +4035,18 @@ int incl(pos_T *lp) int dec(pos_T *lp) { - char_u *p; - lp->coladd = 0; if (lp->col > 0) { // still within line lp->col--; - if (has_mbyte) { - p = ml_get(lp->lnum); - lp->col -= (*mb_head_off)(p, p + lp->col); - } + char_u *p = ml_get(lp->lnum); + lp->col -= utf_head_off(p, p + lp->col); return 0; } if (lp->lnum > 1) { // there is a prior line lp->lnum--; - p = ml_get(lp->lnum); + char_u *p = ml_get(lp->lnum); lp->col = (colnr_T)STRLEN(p); - if (has_mbyte) { - lp->col -= (*mb_head_off)(p, p + lp->col); - } + lp->col -= utf_head_off(p, p + lp->col); return 1; } return -1; // at start of file |