aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorDamián Silvani <munshkr@gmail.com>2014-07-20 12:35:29 -0300
committerDamián Silvani <munshkr@gmail.com>2014-08-14 23:20:08 -0300
commitfc93536a901b4037f76a223c03d3650afb371f0b (patch)
tree74e5903938baabc19fd791631c46d4c1ad1723ff /src/nvim/screen.c
parent6d4530979745aae216909f066c930893bbfbae81 (diff)
downloadrneovim-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/screen.c')
-rw-r--r--src/nvim/screen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 1fd872d61c..03c59bf584 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -41,7 +41,7 @@
*
* The part of the buffer that is displayed in a window is set with:
* - w_topline (first buffer line in window)
- * - w_topfill (filler line above the first line)
+ * - w_topfill (filler lines above the first line)
* - w_leftcol (leftmost window cell in window),
* - w_skipcol (skipped window cells of first line)
*
@@ -7341,7 +7341,8 @@ int showmode(void)
attr = hl_attr(HLF_CM); /* Highlight mode */
if (do_mode) {
MSG_PUTS_ATTR("--", attr);
- if (edit_submode != NULL) { /* CTRL-X in Insert mode */
+ // CTRL-X in Insert mode
+ if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) {
/* These messages can get long, avoid a wrap in a narrow
* window. Prefer showing edit_submode_extra. */
length = (Rows - msg_row) * Columns - 3;