aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/terminal.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-08-06 04:25:55 +0200
committerGitHub <noreply@github.com>2017-08-06 04:25:55 +0200
commit5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (patch)
treefc61484a30532ef89f24c5b60534dccc56408d17 /src/nvim/terminal.c
parent55c0401dfd137a5e173d8551f763cb4c6fed56e1 (diff)
parent3827d5bc713d9ed149bc793f411debb5b89a4eba (diff)
downloadrneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.gz
rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.bz2
rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.zip
Merge #7110 from justinmk/preserve-wildmenu
Diffstat (limited to 'src/nvim/terminal.c')
-rw-r--r--src/nvim/terminal.c6
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;