File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -87,7 +87,8 @@ to the job. For example:
87
87
'termwinkey' CTRL-W move focus to the next window
88
88
'termwinkey' : enter an Ex command
89
89
'termwinkey' 'termwinkey' send 'termwinkey' to the job in the terminal
90
- 'termwinkey' . send a CTRL-W to the job in the terminal
90
+ 'termwinkey' . send 'termwinkey' to the job in the terminal
91
+ 'termwinkey' CTRL-\ send a CTRL-\ to the job in the terminal
91
92
'termwinkey' N go to terminal Normal mode, see below
92
93
'termwinkey' CTRL-N same as CTRL-W N
93
94
'termwinkey' CTRL-C same as | t_CTRL-W_CTRL-C |
Original file line number Diff line number Diff line change @@ -2107,7 +2107,11 @@ terminal_loop(int blocking)
2107
2107
in_terminal_loop = curbuf -> b_term ;
2108
2108
2109
2109
if (* curwin -> w_p_twk != NUL )
2110
+ {
2110
2111
termwinkey = string_to_key (curwin -> w_p_twk , TRUE);
2112
+ if (termwinkey == Ctrl_W )
2113
+ termwinkey = 0 ;
2114
+ }
2111
2115
position_cursor (curwin , & curbuf -> b_term -> tl_cursor_pos );
2112
2116
may_set_cursor_props (curbuf -> b_term );
2113
2117
@@ -2203,12 +2207,13 @@ terminal_loop(int blocking)
2203
2207
/* "CTRL-W CTRL-C" or 'termwinkey' CTRL-C: end the job */
2204
2208
mch_signal_job (curbuf -> b_term -> tl_job , (char_u * )"kill" );
2205
2209
}
2206
- else if (termwinkey == 0 && c == '.' )
2210
+ else if (c == '.' )
2207
2211
{
2208
2212
/* "CTRL-W .": send CTRL-W to the job */
2209
- c = Ctrl_W ;
2213
+ /* "'termwinkey' .": send 'termwinkey' to the job */
2214
+ c = termwinkey == 0 ? Ctrl_W : termwinkey ;
2210
2215
}
2211
- else if (termwinkey == 0 && c == Ctrl_BSL )
2216
+ else if (c == Ctrl_BSL )
2212
2217
{
2213
2218
/* "CTRL-W CTRL-\": send CTRL-\ to the job */
2214
2219
c = Ctrl_BSL ;
Original file line number Diff line number Diff line change @@ -761,6 +761,8 @@ static char *(features[]) =
761
761
762
762
static int included_patches [] =
763
763
{ /* Add new patch number below this line */
764
+ /**/
765
+ 72 ,
764
766
/**/
765
767
71 ,
766
768
/**/
You can’t perform that action at this time.
0 commit comments