From 0786ebe305f882fe6d9cd8771fdc821dcaad46a6 Mon Sep 17 00:00:00 2001
From: KillTheMule <KillTheMule@users.noreply.github.com>
Date: Mon, 25 Apr 2016 20:55:37 +0200
Subject: [PATCH] vim-patch:7.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)

https://github.com/vim/vim/commit/5f1fea28f5bc573e2430773c49e95ae1f9cc2a25

Applied manually.
---
 src/nvim/edit.c    | 6 ++++++
 src/nvim/version.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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,