diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-07 07:51:03 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-07 07:51:03 +0800 |
| commit | 8b4dc955b7384180c1ae0eab6050bbf4e17c7673 (patch) | |
| tree | 32508d91df7b98baeae52288b8cf0aa08b40b80a /src/nvim/terminal.c | |
| parent | c972efc9d113232b2688ea5c2adc8834a4eda195 (diff) | |
| parent | 2753d61e4cb037323d78ed3fd978a10694c902c6 (diff) | |
| download | rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.gz rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.bz2 rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/terminal.c')
| -rw-r--r-- | src/nvim/terminal.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 099f49f09b..deec930ebd 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -43,6 +43,7 @@ #include <vterm.h> +#include "nvim/log.h" #include "nvim/vim.h" #include "nvim/terminal.h" #include "nvim/message.h" @@ -1010,7 +1011,10 @@ static void refresh_terminal(Terminal *term) // Calls refresh_terminal() on all invalidated_terminals. static void refresh_timer_cb(TimeWatcher *watcher, void *data) { - if (exiting) { // Cannot redraw (requires event loop) during teardown/exit. + if (exiting // Cannot redraw (requires event loop) during teardown/exit. + // WM_LIST (^D) is not redrawn, unlike the normal wildmenu. So we must + // skip redraws to keep it visible. + || wild_menu_showing == WM_LIST) { goto end; } Terminal *term; |