aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/edit.c6
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 26966b35c1..df5d5bb0fd 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -3306,6 +3306,12 @@ static bool ins_compl_prep(int c)
showmode();
}
+ // Avoid the popup menu remains displayed when leaving the
+ // command line window.
+ if (c == Ctrl_C && cmdwin_type != 0) {
+ update_screen(0);
+ }
+
/*
* Indent now if a key was typed that is in 'cinkeys'.
*/
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b9e97f205e..5347a05c0b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -796,7 +796,7 @@ static int included_patches[] = {
885,
// 884 NA
883,
- // 882,
+ 882,
881,
// 880 NA
879,