diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-02-03 20:47:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 20:47:29 +0800 |
| commit | 89e308d7daeb8b2344105877200c7c5ae83760b0 (patch) | |
| tree | 17618e0b9ad59a16e9b4b16e1b8b0d6ea0dcafbf /src/nvim/message.c | |
| parent | 02d4c9158831be1ed89beb1c840d3d4efcf099c4 (diff) | |
| parent | 2793fcae0ac2aef14c8f22636d579c68a97c0851 (diff) | |
| download | rneovim-89e308d7daeb8b2344105877200c7c5ae83760b0.tar.gz rneovim-89e308d7daeb8b2344105877200c7c5ae83760b0.tar.bz2 rneovim-89e308d7daeb8b2344105877200c7c5ae83760b0.zip | |
Merge pull request #17226 from dundargoc/refactor/remove-redundant-code
vim-patch:8.2.4241: some type casts are redundant
Diffstat (limited to 'src/nvim/message.c')
| -rw-r--r-- | src/nvim/message.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index e1e253cd2e..d963cba6cb 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -262,7 +262,6 @@ void msg_multiline_attr(const char *s, int attr, bool check_int, bool *need_clea if (*s != NUL) { msg_outtrans_attr((char_u *)s, attr); } - return; } @@ -329,7 +328,7 @@ bool msg_attr_keep(const char *s, int attr, bool keep, bool multiline) } retval = msg_end(); - if (keep && retval && vim_strsize((char_u *)s) < (int)(Rows - cmdline_row - 1) + if (keep && retval && vim_strsize((char_u *)s) < (Rows - cmdline_row - 1) * Columns + sc_col) { set_keep_msg((char *)s, 0); } @@ -356,10 +355,10 @@ char_u *msg_strtrunc(char_u *s, int force) len = vim_strsize(s); if (msg_scrolled != 0) { // Use all the columns. - room = (int)(Rows - msg_row) * Columns - 1; + room = (Rows - msg_row) * Columns - 1; } else { // Use up to 'showcmd' column. - room = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; + room = (Rows - msg_row - 1) * Columns + sc_col - 1; } if (len > room && room > 0) { // may have up to 18 bytes per cell (6 per char, up to two @@ -873,7 +872,7 @@ char_u *msg_may_trunc(bool force, char_u *s) { int room; - room = (int)(Rows - cmdline_row - 1) * Columns + sc_col - 1; + room = (Rows - cmdline_row - 1) * Columns + sc_col - 1; if ((force || (shortmess(SHM_TRUNC) && !exmode_active)) && (int)STRLEN(s) - room > 0) { int size = vim_strsize(s); |