aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.0913: MS-Windows: CTRL-C kills shell in terminal window

Browse Source 
Problem:    MS-Windows: CTRL-C kills shell in terminal window instead of the
            command running in the shell.
Solution:   Make CTRL-C only send a CTRL_C_EVENT and have CTRL-BREAK kill the
            job. (partly by Yasuhiro Matsumoto, closes #1962)
This commit is contained in:
Bram Moolenaar
2017-08-12 14:52:15 +02:00
parent 8cad930a25
commit 9698ad7201
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/terminal.c
View File

@@ -1016,6 +1016,9 @@ term_vgetc()
++no_mapping;
++allow_keys;
got_int = FALSE;
#ifdef WIN3264
ctrl_break_was_pressed = FALSE;
#endif
c = vgetc();
got_int = FALSE;
--no_mapping;
@@ -1201,11 +1204,14 @@ 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.
* Use CTRL-BREAK to kill the job. */
if (c == Ctrl_C)
/* We don't know if the job can handle CTRL-C itself or not, this
* may kill the shell instead of killing the command running in the
* shell. */
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"quit");
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
if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL)