diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-02-22 17:07:47 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-22 19:23:20 -0500 |
| commit | bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40 (patch) | |
| tree | b5b295f6a593f77f6995e6d6478afdf37043b11d /src/nvim/edit.c | |
| parent | 10c9ecc2117a69d2b83e983082f53c1779547035 (diff) | |
| parent | ddab4661f7acad985096138b0c29a2b7e569022a (diff) | |
| download | rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.gz rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.bz2 rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.zip | |
Merge remote-tracking branch 'origin/master' into lambda
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 53540d21d4..9a8ff21263 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -1859,8 +1859,9 @@ static bool check_compl_option(bool dict_opt) : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)) { ctrl_x_mode = 0; edit_submode = NULL; - msg_attr(dict_opt ? (char_u *)_("'dictionary' option is empty") - : (char_u *)_("'thesaurus' option is empty"), hl_attr(HLF_E)); + msg_attr((dict_opt + ? _("'dictionary' option is empty") + : _("'thesaurus' option is empty")), hl_attr(HLF_E)); if (emsg_silent == 0) { vim_beep(BO_COMPL); setcursor(); @@ -4801,9 +4802,9 @@ static int ins_complete(int c, bool enable_pum) if (!shortmess(SHM_COMPLETIONMENU)) { if (edit_submode_extra != NULL) { if (!p_smd) { - msg_attr(edit_submode_extra, - edit_submode_highl < HLF_COUNT - ? hl_attr(edit_submode_highl) : 0); + msg_attr((const char *)edit_submode_extra, + (edit_submode_highl < HLF_COUNT + ? hl_attr(edit_submode_highl) : 0)); } } else { msg_clr_cmdline(); // necessary for "noshowmode" |