thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0421: interrupting with CTRL-C does not always work

Browse Source 
Problem:    Interrupting with CTRL-C does not always work.
Solution:   Recognize CTRL-C while modifyOtherKeys is set.
This commit is contained in:
Bram Moolenaar
2020-03-20 20:48:49 +01:00
parent f1ec378b01
commit 9645e2d9fc
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui.c
View File

@@ -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));