diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-11-15 18:18:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-15 18:18:12 +0100 |
| commit | 1b8867ab39ecc25d454ca67e3cb8b3ef5fca9ed3 (patch) | |
| tree | 1c169437d934d30564b42127b11e888fde04a2fd /src/nvim/version.c | |
| parent | bcadf324cb6516369cb89da9bb1e8056f6fb91bb (diff) | |
| parent | 87aaa8e837d873577ee6a908a387f40e3548bcb6 (diff) | |
| download | rneovim-1b8867ab39ecc25d454ca67e3cb8b3ef5fca9ed3.tar.gz rneovim-1b8867ab39ecc25d454ca67e3cb8b3ef5fca9ed3.tar.bz2 rneovim-1b8867ab39ecc25d454ca67e3cb8b3ef5fca9ed3.zip | |
Merge pull request #13293 from janlazo/vim-8.2.1976
vim-patch:8.2.{1979,1981,1982,1985,1987}
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 7296c74109..6be2a61c6a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -2301,14 +2301,11 @@ static void do_intro_line(long row, char_u *mesg, int attr) for (p = mesg; *p != NUL; p += l) { clen = 0; - for (l = 0; p[l] != NUL - && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); ++l) { - if (has_mbyte) { - clen += ptr2cells(p + l); - l += (*mb_ptr2len)(p + l) - 1; - } else { - clen += byte2cells(p[l]); - } + for (l = 0; + p[l] != NUL && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); + l++) { + clen += ptr2cells(p + l); + l += utfc_ptr2len(p + l) - 1; } assert(row <= INT_MAX && col <= INT_MAX); grid_puts_len(&default_grid, p, l, (int)row, (int)col, |