adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.1611: CTRL-W in system terminal does not go to job

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2018-03-16 22:20:49 +01:00
parent 4ac31eeff0
commit af23bad0fd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/terminal.c
View File

@ -2007,8 +2007,13 @@ terminal_loop(int blocking)
if (ctrl_break_was_pressed) if (ctrl_break_was_pressed)
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
#endif #endif
/* Was either CTRL-W (termkey) or CTRL-\ pressed? */ /* Was either CTRL-W (termkey) or CTRL-\ pressed?
if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) * 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; int prev_c = c;

2
src/version.c
View File

@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1611,
/**/ /**/
1610, 1610,
/**/ /**/