diff options
| author | glacambre <code@lacamb.re> | 2022-01-25 07:59:17 +0100 |
|---|---|---|
| committer | glacambre <code@lacamb.re> | 2022-02-05 13:02:33 +0100 |
| commit | 5b34c2ab73d62431f391d454e68a84332148d609 (patch) | |
| tree | 96baf10d78ad63e6cbc0297ac4f04d59bbfaeb38 /src | |
| parent | 806a7c976d78da2bf7a46499452b4a3e30fae798 (diff) | |
| download | rneovim-5b34c2ab73d62431f391d454e68a84332148d609.tar.gz rneovim-5b34c2ab73d62431f391d454e68a84332148d609.tar.bz2 rneovim-5b34c2ab73d62431f391d454e68a84332148d609.zip | |
fix(--headless): do not block on press-enter prompts when no UI
This commit fixes #9358, where emitting multiple messages with 'echo' or
a single one with 'echom' or 'echoerr' would result in a press-enter
prompt that couldn't be dismissed by pressing enter.
This requires adapting a few tests to spawn a UI before testing whether
press-enter prompts are blocking.
It also fixes #11718, as when combined with #15910 it enables making
sure that neovim never blocks and emits messages on startup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index d963cba6cb..93742ccbdb 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1094,6 +1094,10 @@ void wait_return(int redraw) return; } + if (headless_mode && !ui_active()) { + return; + } + /* * When inside vgetc(), we can't wait for a typed character at all. * With the global command (and some others) we only need one return at |