From 93c18867a0e79bf71bffa9f8ce533f224d759ee5 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Thu, 12 Nov 2020 02:01:07 -0500
Subject: vim-patch:8.1.0810: too many #ifdefs

Problem:    Too many #ifdefs.
Solution:   Graduate FEAT_MBYTE, part 4.
https://github.com/vim/vim/commit/264b74fa545edfb92c0d7d08a02c26331cc5b168
---
 src/nvim/syntax.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/nvim/syntax.c')

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index ec6accd473..2f8b2989f5 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -2960,11 +2960,7 @@ static int check_keyword_id(
   char_u *const kwp = line + startcol;
   int kwlen = 0;
   do {
-    if (has_mbyte) {
-      kwlen += (*mb_ptr2len)(kwp + kwlen);
-    } else {
-      kwlen++;
-    }
+    kwlen += utfc_ptr2len(kwp + kwlen);
   } while (vim_iswordp_buf(kwp + kwlen, syn_buf));
 
   if (kwlen > MAXKEYWLEN) {
-- 
cgit