diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/terminal.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c index 2043c8487e..867a0e3f3b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2640,12 +2640,13 @@ if (raw_c > 0) } else if (termwinkey == 0 || c != termwinkey) { - char_u buf[MB_MAXBYTES + 2]; + // space for CTRL-W, modifier, multi-byte char and NUL + char_u buf[1 + 3 + MB_MAXBYTES + 1]; // Put the command into the typeahead buffer, when using the // stuff buffer KeyStuffed is set and 'langmap' won't be used. buf[0] = Ctrl_W; - buf[(*mb_char2bytes)(c, buf + 1) + 1] = NUL; + buf[special_to_buf(c, mod_mask, FALSE, buf + 1) + 1] = NUL; ins_typebuf(buf, REMAP_NONE, 0, TRUE, FALSE); ret = OK; goto theend; diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 207ef9afe3..676d864c72 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1379,6 +1379,23 @@ func Test_terminal_statusline() set statusline= endfunc +func Test_terminal_window_focus() + let winid1 = win_getid() + terminal + let winid2 = win_getid() + call feedkeys("\<C-W>j", 'xt') + call assert_equal(winid1, win_getid()) + call feedkeys("\<C-W>k", 'xt') + call assert_equal(winid2, win_getid()) + " can use a cursor key here + call feedkeys("\<C-W>\<Down>", 'xt') + call assert_equal(winid1, win_getid()) + call feedkeys("\<C-W>\<Up>", 'xt') + call assert_equal(winid2, win_getid()) + + bwipe! +endfunc + func Api_drop_common(options) call assert_equal(1, winnr('$')) diff --git a/src/version.c b/src/version.c index d390212d8a..d5c8f30277 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1772, +/**/ 1771, /**/ 1770, |