diff options
author | Damián Silvani <munshkr@gmail.com> | 2014-07-20 12:35:29 -0300 |
---|---|---|
committer | Damián Silvani <munshkr@gmail.com> | 2014-08-14 23:20:08 -0300 |
commit | fc93536a901b4037f76a223c03d3650afb371f0b (patch) | |
tree | 74e5903938baabc19fd791631c46d4c1ad1723ff /src/nvim/edit.c | |
parent | 6d4530979745aae216909f066c930893bbfbae81 (diff) | |
download | rneovim-fc93536a901b4037f76a223c03d3650afb371f0b.tar.gz rneovim-fc93536a901b4037f76a223c03d3650afb371f0b.tar.bz2 rneovim-fc93536a901b4037f76a223c03d3650afb371f0b.zip |
vim-patch:7.4.314
Problem: Completion messages can get in the way of a plugin.
Solution: Add 'c' flag to 'shortmess' option. (Shougo Matsu)
https://code.google.com/p/vim/source/detail?r=4d7af1962d6ce61df65fdc5c86544a61951f9517
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) { |