From af23bad0fd05b1f6495287089387a1f97efa5b49 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 16 Mar 2018 22:20:49 +0100 Subject: [PATCH] patch 8.0.1611: CTRL-W in system terminal does not go to job Problem: CTRL-W in system terminal does not go to job. Solution: Do not use CTRL-W as a terminal command in a system terminal. --- src/terminal.c | 9 +++++++-- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/terminal.c b/src/terminal.c index bff83d24b9..67972f14b5 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2007,8 +2007,13 @@ terminal_loop(int blocking) if (ctrl_break_was_pressed) mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); #endif - /* Was either CTRL-W (termkey) or CTRL-\ pressed? */ - if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) + /* Was either CTRL-W (termkey) or CTRL-\ pressed? + * Not in a system terminal. */ + if ((c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) +#ifdef FEAT_GUI + && !curbuf->b_term->tl_system +#endif + ) { int prev_c = c; diff --git a/src/version.c b/src/version.c index eda2a8580d..6ab5963ead 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1611, /**/ 1610, /**/