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.

diff --git a/src/terminal.c b/src/terminal.c
index bff83d24b9eb1f6a19db01020d0d16068a576f7e..67972f14b55ea2dcbf757630199cbef3adb4f9e1 100644 (file)
--- 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 eda2a8580d1daa9f9fb245bf03ada2219121b25d..6ab5963ead343363983c035d16497a21c70dcf72 100644 (file)
--- 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,
 /**/