0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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)
This commit is contained in:
Bram Moolenaar
2017-03-29 17:30:27 +02:00
parent 0c078fc7db
commit ace95989ed
7 changed files with 21 additions and 19 deletions

View File

@@ -1208,7 +1208,7 @@ can_compound(slang_T *slang, char_u *word, char_u *flags)
/* Need to convert the single byte flags to utf8 characters. */
p = uflags;
for (i = 0; flags[i] != NUL; ++i)
p += mb_char2bytes(flags[i], p);
p += utf_char2bytes(flags[i], p);
*p = NUL;
p = uflags;
}
@@ -5117,11 +5117,11 @@ suggest_trie_walk(
* SCORE_SUBCOMP. */
if (enc_utf8
&& utf_iscomposing(
mb_ptr2char(tword
utf_ptr2char(tword
+ sp->ts_twordlen
- sp->ts_tcharlen))
&& utf_iscomposing(
mb_ptr2char(fword
utf_ptr2char(fword
+ sp->ts_fcharstart)))
sp->ts_score -=
SCORE_SUBST - SCORE_SUBCOMP;