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)

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 985a0e62f986f8b80104c93ee5fc44680f2bfa9e..0edfe500035287886b1737483bdd1abbcdff52dd 100644 (file)
--- 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 8cfc17c5f57d1936b77659c032a117ea88c878db..8bbd1e4b12217af29e2941b13b75022a5075299f 100644 (file)
--- 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,
 /**/