diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-28 21:40:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-28 21:40:52 +0200 |
| commit | ea389e910326a0b44a9c534535c1c4c8b1841388 (patch) | |
| tree | e0065bab0382c8780d6a385f35ec22575a53042e /src/edit.c | |
| parent | 6f6c0f8085a5b0855f9dce8378086fd5e06a219b (diff) | |
updated for version 7.4.314v7.4.314
Problem: Completion messages can get in the way of a plugin.
Solution: Add 'c' flag to 'shortmess' option. (Shougo Matsu)
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/edit.c b/src/edit.c index a0ad9aaed7..94ec789769 100644 --- a/src/edit.c +++ b/src/edit.c @@ -3854,7 +3854,8 @@ ins_compl_prep(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) @@ -5285,7 +5286,8 @@ ins_complete(c) { ctrl_x_mode = 0; edit_submode = NULL; - msg_clr_cmdline(); + if (!shortmess(SHM_COMPLETIONMENU)) + msg_clr_cmdline(); return FAIL; } @@ -5544,15 +5546,18 @@ ins_complete(c) /* Show a message about what (completion) mode we're in. */ showmode(); - if (edit_submode_extra != NULL) + if (!shortmess(SHM_COMPLETIONMENU)) { - if (!p_smd) - msg_attr(edit_submode_extra, - edit_submode_highl < HLF_COUNT - ? hl_attr(edit_submode_highl) : 0); + 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" */ } - else - msg_clr_cmdline(); /* necessary for "noshowmode" */ /* Show the popup menu, unless we got interrupted. */ if (!compl_interrupted) |