diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-06 20:52:30 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-06 21:11:38 -0400 |
| commit | 09232958ff9c7d4737701160549c8d64a0f92856 (patch) | |
| tree | 44b704107b24cbe6d2777ab5556c98c7d645b45f /src/nvim/getchar.c | |
| parent | 8f20c50caa7fa008f5e6257ef0fc43620e3baeb1 (diff) | |
| download | rneovim-09232958ff9c7d4737701160549c8d64a0f92856.tar.gz rneovim-09232958ff9c7d4737701160549c8d64a0f92856.tar.bz2 rneovim-09232958ff9c7d4737701160549c8d64a0f92856.zip | |
vim-patch:8.1.2120: some MB_ macros are more complicated than necessary
Problem: Some MB_ macros are more complicated than necessary. (Dominique
Pelle)
Solution: Simplify the macros. Expand inline.
https://github.com/vim/vim/commit/1614a14901558ca091329315d14a7d5e1b53aa47
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index af642a8e11..1f82df3241 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1833,13 +1833,13 @@ static int vgetorpeek(int advance) char_u *p1 = mp->m_keys; char_u *p2 = (char_u *)mb_unescape((const char **)&p1); - if (has_mbyte && p2 != NULL && MB_BYTE2LEN(c1) > MB_PTR2LEN(p2)) + if (p2 != NULL && MB_BYTE2LEN(c1) > utfc_ptr2len(p2)) { mlen = 0; - /* - * Check an entry whether it matches. - * - Full match: mlen == keylen - * - Partly match: mlen == typebuf.tb_len - */ + } + + // Check an entry whether it matches. + // - Full match: mlen == keylen + // - Partly match: mlen == typebuf.tb_len keylen = mp->m_keylen; if (mlen == keylen || (mlen == typebuf.tb_len |