Skip to content

Commit af23bad

Browse files
committed
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.
1 parent 4ac31ee commit af23bad

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/terminal.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,8 +2007,13 @@ terminal_loop(int blocking)
20072007
if (ctrl_break_was_pressed)
20082008
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
20092009
#endif
2010-
/* Was either CTRL-W (termkey) or CTRL-\ pressed? */
2011-
if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL)
2010+
/* Was either CTRL-W (termkey) or CTRL-\ pressed?
2011+
* Not in a system terminal. */
2012+
if ((c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL)
2013+
#ifdef FEAT_GUI
2014+
&& !curbuf->b_term->tl_system
2015+
#endif
2016+
)
20122017
{
20132018
int prev_c = c;
20142019

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ static char *(features[]) =
766766

767767
static int included_patches[] =
768768
{ /* Add new patch number below this line */
769+
/**/
770+
1611,
769771
/**/
770772
1610,
771773
/**/

0 commit comments

Comments
 (0)