From 90128843f68bc6b96cc7ab7a97d172aaae742aa4 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 10 Aug 2018 17:53:33 -0400 Subject: diff: drop enc_utf8 check in diff_equal_char() enc_utf8 is always true for nvim. --- src/nvim/diff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 8dc9d0ee10..e7a176d336 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1609,8 +1609,7 @@ static bool diff_equal_char(const char_u *const p1, const char_u *const p2, } if (l > 1) { if (STRNCMP(p1, p2, l) != 0 - && (!enc_utf8 - || !(diff_flags & DIFF_ICASE) + && (!(diff_flags & DIFF_ICASE) || utf_fold(utf_ptr2char(p1)) != utf_fold(utf_ptr2char(p2)))) { return false; } -- cgit