diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-07-29 21:41:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-02-15 02:48:33 +0300 |
| commit | efa2682e3b513c4a33d987dc651db5913feff21a (patch) | |
| tree | 46736cfd53da15a607a332afc79f8359f50bd455 /src/nvim/screen.c | |
| parent | 2a50ff7e2fa724fc748068ba19012239886b74dd (diff) | |
| download | rneovim-efa2682e3b513c4a33d987dc651db5913feff21a.tar.gz rneovim-efa2682e3b513c4a33d987dc651db5913feff21a.tar.bz2 rneovim-efa2682e3b513c4a33d987dc651db5913feff21a.zip | |
*: Partial string handling refactoring
Main points:
- Replace `char_u` with `char` in some cases.
- Remove `str[len] = NUL` hack in some cases when `str` may be considered
`const`.
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 3823fb2a23..de16572dc2 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -6719,17 +6719,19 @@ int showmode(void) if (edit_submode_pre != NULL) length -= vim_strsize(edit_submode_pre); if (length - vim_strsize(edit_submode) > 0) { - if (edit_submode_pre != NULL) - msg_puts_attr(edit_submode_pre, attr); - msg_puts_attr(edit_submode, attr); + if (edit_submode_pre != NULL) { + msg_puts_attr((const char *)edit_submode_pre, attr); + } + msg_puts_attr((const char *)edit_submode, attr); } if (edit_submode_extra != NULL) { MSG_PUTS_ATTR(" ", attr); /* add a space in between */ - if ((int)edit_submode_highl < (int)HLF_COUNT) + if ((int)edit_submode_highl < (int)HLF_COUNT) { sub_attr = hl_attr(edit_submode_highl); - else + } else { sub_attr = attr; - msg_puts_attr(edit_submode_extra, sub_attr); + } + msg_puts_attr((const char *)edit_submode_extra, sub_attr); } } } else { |