summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-25 19:12:22 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-25 19:12:22 +0200
commit5f1fea28f5bc573e2430773c49e95ae1f9cc2a25 (patch)
tree43c6b6c360f7ecd37c74c6c176cca5a9063c0e17
parent0a777ab9890ba0e8dd57f082e98fde1adab36aa0 (diff)
downloadvim-git-5f1fea28f5bc573e2430773c49e95ae1f9cc2a25.tar.gz
patch 7.4.882v7.4.882
Problem: When leaving the command line window with CTRL-C while a completion menu is displayed the menu isn't removed. Solution: Force a screen update. (Hirohito Higashi)
-rw-r--r--src/edit.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index db4a079e4..bd5c57e1a 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3903,6 +3903,12 @@ ins_compl_prep(c)
showmode();
}
+#ifdef FEAT_CMDWIN
+ if (c == Ctrl_C && cmdwin_type != 0)
+ /* Avoid the popup menu remains displayed when leaving the
+ * command line window. */
+ update_screen(0);
+#endif
#ifdef FEAT_CINDENT
/*
* Indent now if a key was typed that is in 'cinkeys'.
diff --git a/src/version.c b/src/version.c
index 079d99d68..586ce19c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 882,
+/**/
881,
/**/
880,