From 721f69c4af8bc81ba04088e7b56f8cdba653b418 Mon Sep 17 00:00:00 2001 From: Ghjuvan Lacambre Date: Mon, 22 Jun 2020 23:22:58 +0200 Subject: terminal: preserve mode when using wincmd in terminal mode (#12254) --- src/nvim/terminal.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index a096b77ac6..6a13341a89 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -489,7 +489,17 @@ static int terminal_execute(VimState *state, int key) terminal_send_key(s->term, key); } - return curbuf->handle == s->term->buf_handle; + if (curbuf->terminal == NULL) { + return 0; + } + if (s->term != curbuf->terminal) { + invalidate_terminal(s->term, s->term->cursor.row, s->term->cursor.row + 1); + invalidate_terminal(curbuf->terminal, + curbuf->terminal->cursor.row, + curbuf->terminal->cursor.row + 1); + s->term = curbuf->terminal; + } + return 1; } void terminal_destroy(Terminal *term) -- cgit