diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-07 22:09:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-07 22:09:11 +0100 |
| commit | 52f18a112a073c39187cd93f26115d1e2bfd29ce (patch) | |
| tree | 53d5bd81432d0a0e3d0bb60a7e2f4e6001405044 /src | |
| parent | 3324d0a86421a634572758dcfde917547f4d4c67 (diff) | |
| download | vim-git-52f18a112a073c39187cd93f26115d1e2bfd29ce.tar.gz | |
patch 8.0.1588: popup menu hangs after typing CTRL-Cv8.0.1588
Problem: Popup menu hangs after typing CTRL-C.
Solution: Make CTRL-C exit the loop. (Ozaki Kiichi, closes #2697)
Diffstat (limited to 'src')
| -rw-r--r-- | src/popupmnu.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c index 985a0e62f..0edfe5000 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 8cfc17c5f..8bbd1e4b1 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1588, +/**/ 1587, /**/ 1586, |