aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.0.1588: popup menu hangs after typing CTRL-C

Browse Source 
Problem:    Popup menu hangs after typing CTRL-C.
Solution:   Make CTRL-C exit the loop. (Ozaki Kiichi, closes #2697)
This commit is contained in:
Bram Moolenaar
2018-03-07 22:09:11 +01:00
parent 3324d0a864
commit 52f18a112a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/popupmnu.c
View File

@@ -1175,7 +1175,7 @@ pum_show_popupmenu(vimmenu_T *menu)
out_flush(); out_flush();
c = vgetc(); c = vgetc();
if (c == ESC) if (c == ESC || c == Ctrl_C)
break; break;
else if (c == CAR || c == NL) 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) 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(); pum_select_mouse_pos();
} }
else if (c == K_LEFTMOUSE || c == K_LEFTMOUSE_NM || c == K_RIGHTRELEASE) else if (c == K_LEFTMOUSE || c == K_LEFTMOUSE_NM || c == K_RIGHTRELEASE)

2
src/version.c
View File

@@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1588,
/**/ /**/
1587, 1587,
/**/ /**/