Mercurial > vim
diff src/ui.c @ 19730:fe8ba2f82f59 v8.2.0421
patch 8.2.0421: interrupting with CTRL-C does not always work
Commit: https://github.com/vim/vim/commit/9645e2d9fc8a591f1db30383caccf71d40e0810c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 20 20:48:49 2020 +0100
patch 8.2.0421: interrupting with CTRL-C does not always work
Problem: Interrupting with CTRL-C does not always work.
Solution: Recognize CTRL-C while modifyOtherKeys is set.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 20 Mar 2020 21:00:05 +0100 |
| parents | 2ef19eed524a |
| children | 0208534b8a84 |
line wrap: on
line diff
--- a/src/ui.c +++ b/src/ui.c @@ -2280,7 +2280,7 @@ fill_input_buf(int exit_on_error UNUSED) for (try = 0; try < 100; ++try) { size_t readlen = (size_t)((INBUFLEN - inbufcount) - / input_conv.vc_factor); + / input_conv.vc_factor); # ifdef VMS len = vms_read((char *)inbuf + inbufcount, readlen); # else @@ -2344,9 +2344,12 @@ fill_input_buf(int exit_on_error UNUSED) while (len-- > 0) { /* - * if a CTRL-C was typed, remove it from the buffer and set got_int + * If a CTRL-C was typed, remove it from the buffer and set + * got_int. Also recognize CTRL-C with modifyOtherKeys set. */ - if (inbuf[inbufcount] == 3 && ctrl_c_interrupts) + if (ctrl_c_interrupts && (inbuf[inbufcount] == 3 + || (len >= 9 && STRNCMP(inbuf + inbufcount, + "\e[27;5;99~", 10) == 0))) { // remove everything typed before the CTRL-C mch_memmove(inbuf, inbuf + inbufcount, (size_t)(len + 1));