From 52f18a112a073c39187cd93f26115d1e2bfd29ce Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 7 Mar 2018 22:09:11 +0100
Subject: [PATCH] patch 8.0.1588: popup menu hangs after typing CTRL-C

Problem:    Popup menu hangs after typing CTRL-C.
Solution:   Make CTRL-C exit the loop. (Ozaki Kiichi, closes #2697)
---
 src/popupmnu.c | 4 ++--
 src/version.c  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 985a0e62f9..0edfe50003 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -1175,7 +1175,7 @@ pum_show_popupmenu(vimmenu_T *menu)
 	out_flush();
 
 	c = vgetc();
-	if (c == ESC)
+	if (c == ESC || c == Ctrl_C)
 	    break;
 	else if (c == CAR || c == NL)
 	{
@@ -1211,7 +1211,7 @@ pum_show_popupmenu(vimmenu_T *menu)
 	}
 	else if (c == K_LEFTDRAG || c == K_RIGHTDRAG || c == K_MOUSEMOVE)
 	{
-	    /* mouse moved: selec item in the mouse row */
+	    /* mouse moved: select item in the mouse row */
 	    pum_select_mouse_pos();
 	}
 	else if (c == K_LEFTMOUSE || c == K_LEFTMOUSE_NM || c == K_RIGHTRELEASE)
diff --git a/src/version.c b/src/version.c
index 8cfc17c5f5..8bbd1e4b12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1588,
 /**/
     1587,
 /**/