diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-12 16:39:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-12 16:39:05 +0200 |
| commit | 589b1109c55409baf27f79920d8ffc95111eaa01 (patch) | |
| tree | efe2a01927102431f2e5e1bb209ac4d6f03f2e4f /src/terminal.c | |
| parent | 37c45835945fc433a3bb85fcfc0b4fd58b1ee0e7 (diff) | |
| download | vim-git-589b1109c55409baf27f79920d8ffc95111eaa01.tar.gz | |
patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrongv8.0.0917
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)
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/terminal.c b/src/terminal.c index 0b4c2ef68..e8727ee6e 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -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 |