aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-22 17:07:47 -0500
committerJames McCoy <jamessan@jamessan.com>2017-02-22 19:23:20 -0500
commitbc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40 (patch)
treeb5b295f6a593f77f6995e6d6478afdf37043b11d /src/nvim/screen.c
parent10c9ecc2117a69d2b83e983082f53c1779547035 (diff)
parentddab4661f7acad985096138b0c29a2b7e569022a (diff)
downloadrneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.gz
rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.bz2
rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.zip
Merge remote-tracking branch 'origin/master' into lambda
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 3823fb2a23..6df443754b 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)
+ MSG_PUTS_ATTR(" ", attr); // Add a space in between.
+ 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 {