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

patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong

Browse Source 
Problem:    MS-Windows:CTRL-C handling in terminal window is wrong
Solution:   Pass CTRL-C as a key. Turn CTRL-BREAK into a key stroke. (Yasuhiro
            Matsumoto, closes #1965)
This commit is contained in:
Bram Moolenaar
2017-08-12 16:39:05 +02:00
parent 37c4583594
commit 589b1109c5
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/terminal.c
View File

@@ -1207,12 +1207,8 @@ terminal_loop(void)
may_send_sigint(c, curbuf->b_term->tl_job->jv_pid, 0);
#endif
#ifdef WIN3264
/* On Windows we do not know whether the job can handle CTRL-C itself
* or not. Therefore CTRL-C only sends a CTRL_C_EVENT to avoid killing
* the shell instead of a command running in the shell.
/* On Windows winpty handles CTRL-C, don't send a CTRL_C_EVENT.
* Use CTRL-BREAK to kill the job. */
if (c == Ctrl_C)
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"int");
if (ctrl_break_was_pressed)
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
#endif
@@ -1544,7 +1540,8 @@ term_channel_closed(channel_T *ch)
ch_log(NULL, "terminal job finished, opening window");
vim_snprintf(buf, sizeof(buf),
term->tl_opencmd == NULL
? "botright sbuf %d" : term->tl_opencmd, fnum);
? "botright sbuf %d"
: (char *)term->tl_opencmd, fnum);
do_cmdline_cmd((char_u *)buf);
}
else