patch 8.0.0960: job in terminal does not get CTRL-C
Problem: Job in terminal does not get CTRL-C, we send a SIGINT instead.
Solution: Don't call may_send_sigint() on CTRL-C. Make CTRL-W CTRL-C end
the job.
diff --git a/src/terminal.c b/src/terminal.c
index e8e187b..8d15d3a 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1367,9 +1367,6 @@
if (c == K_IGNORE)
continue;
-#ifdef UNIX
- may_send_sigint(c, curbuf->b_term->tl_job->jv_pid, 0);
-#endif
#ifdef WIN3264
/* On Windows winpty handles CTRL-C, don't send a CTRL_C_EVENT.
* Use CTRL-BREAK to kill the job. */
@@ -1405,6 +1402,11 @@
/* Send both keys to the terminal. */
send_keys_to_term(curbuf->b_term, prev_c, TRUE);
}
+ else if (c == Ctrl_C)
+ {
+ /* "CTRL-W CTRL-C" or 'termkey' CTRL-C: end the job */
+ mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
+ }
else if (termkey == 0 && c == '.')
{
/* "CTRL-W .": send CTRL-W to the job */
diff --git a/src/version.c b/src/version.c
index 7b17219..a424c6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 960,
+/**/
959,
/**/
958,