patch 8.0.0520: using a function pointer while the function is known commit https://github.com/vim/vim/commit/ace95989ed81929a84e205b26d0972cb9d6b4b19 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 29 17:30:27 2017 +0200 patch 8.0.0520: using a function pointer while the function is known Problem: Using a function pointer instead of the actual function, which we know. Solution: Change mb_ functions to utf_ functions when already checked for Unicode. (Dominique Pelle, closes #1582)

--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1974,7 +1974,7 @@ collection:
 nfa_do_multibyte:
 		/* plen is length of current char with composing chars */
 		if (enc_utf8 && ((*mb_char2len)(c)
-			    != (plen = (*mb_ptr2len)(old_regparse))
+			    != (plen = utfc_ptr2len(old_regparse))
 						       || utf_iscomposing(c)))
 		{
 		    int i = 0;