diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
| commit | 474aa823dc5680b06dc84cd2ae248e58b6e83359 (patch) | |
| tree | 1714a0878caecff1f3d9d69228c888728c824d15 /src/nvim/terminal.c | |
| parent | 36acfce4eac9dd131a39c4dbdff2836ab3e21d73 (diff) | |
| parent | 5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (diff) | |
| download | rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.gz rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.bz2 rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.zip | |
Merge branch 'master' into colored-cmdline
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; |