diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-15 08:35:55 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-15 08:35:55 -0400 |
| commit | 933602b1882c6596f06125fc621825c357409899 (patch) | |
| tree | f628ec4bd34a33c7c438c71af47efde491347cc8 /src/nvim/edit.c | |
| parent | 6675a71fe4adb0ea21c842c6bba5e950d05a5f2c (diff) | |
| parent | fc93536a901b4037f76a223c03d3650afb371f0b (diff) | |
| download | rneovim-933602b1882c6596f06125fc621825c357409899.tar.gz rneovim-933602b1882c6596f06125fc621825c357409899.tar.bz2 rneovim-933602b1882c6596f06125fc621825c357409899.zip | |
Merge pull request #971 from munshkr/p7.4.314
vim-patch:7.4.314
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 314af1222f..05d6c9758a 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3151,7 +3151,9 @@ static int ins_compl_prep(int c) ins_compl_free(); compl_started = FALSE; compl_matches = 0; - msg_clr_cmdline(); /* necessary for "noshowmode" */ + if (!shortmess(SHM_COMPLETIONMENU)) { + msg_clr_cmdline(); // necessary for "noshowmode" + } ctrl_x_mode = 0; compl_enter_selects = FALSE; if (edit_submode != NULL) { @@ -4378,7 +4380,9 @@ static int ins_complete(int c) if (col == -3) { ctrl_x_mode = 0; edit_submode = NULL; - msg_clr_cmdline(); + if (!shortmess(SHM_COMPLETIONMENU)) { + msg_clr_cmdline(); + } return FAIL; } @@ -4597,13 +4601,17 @@ static int ins_complete(int c) /* Show a message about what (completion) mode we're in. */ showmode(); - if (edit_submode_extra != NULL) { - if (!p_smd) - msg_attr(edit_submode_extra, - edit_submode_highl < HLF_COUNT - ? hl_attr(edit_submode_highl) : 0); - } else - msg_clr_cmdline(); /* necessary for "noshowmode" */ + 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); + } + } else { + msg_clr_cmdline(); // necessary for "noshowmode" + } + } /* Show the popup menu, unless we got interrupted. */ if (!compl_interrupted) { |