From 2bddc4ca54e31a14b7e9799beda134217ae867e7 Mon Sep 17 00:00:00 2001 From: ZviRackover Date: Wed, 15 Aug 2018 22:02:33 +0300 Subject: Remove occurences of mb_head_off --- src/nvim/diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 878971a35c..cd0aa40ecd 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1965,8 +1965,8 @@ bool diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp) if (has_mbyte) { // Move back to first byte of character in both lines (may // have "nn^" in line_org and "n^ in line_new). - si_org -= (*mb_head_off)(line_org, line_org + si_org); - si_new -= (*mb_head_off)(line_new, line_new + si_new); + si_org -= utf_head_off(line_org, line_org + si_org); + si_new -= utf_head_off(line_new, line_new + si_new); } if (*startp > si_org) { -- cgit From 30392b635689a5f25421c17ead79e521863c8b57 Mon Sep 17 00:00:00 2001 From: ZviRackover Date: Wed, 15 Aug 2018 22:46:48 +0300 Subject: Remove has_mbyte from lines near changes in parent commit --- src/nvim/diff.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index cd0aa40ecd..4bfe67c9d3 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1962,12 +1962,10 @@ bool diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp) } } - if (has_mbyte) { - // Move back to first byte of character in both lines (may - // have "nn^" in line_org and "n^ in line_new). - si_org -= utf_head_off(line_org, line_org + si_org); - si_new -= utf_head_off(line_new, line_new + si_new); - } + // Move back to first byte of character in both lines (may + // have "nn^" in line_org and "n^ in line_new). + si_org -= utf_head_off(line_org, line_org + si_org); + si_new -= utf_head_off(line_new, line_new + si_new); if (*startp > si_org) { *startp = si_org; -- cgit