diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-11 17:50:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 17:50:52 +0800 |
| commit | 0d8e8d36ec7d3f4967f27389b4b94edf3ba57433 (patch) | |
| tree | 94f62c40fbb8714ab4f811682e450fd8d7affd68 /src/nvim/screen.c | |
| parent | fc7ac688c397b5f748920597fcc70fe46e907944 (diff) | |
| download | rneovim-0d8e8d36ec7d3f4967f27389b4b94edf3ba57433.tar.gz rneovim-0d8e8d36ec7d3f4967f27389b4b94edf3ba57433.tar.bz2 rneovim-0d8e8d36ec7d3f4967f27389b4b94edf3ba57433.zip | |
vim-patch:8.2.1919: assert_fails() setting emsg_silent changes normal execution (#20998)
Problem: Assert_fails() setting emsg_silent changes normal execution.
Solution: Use a separate flag in_assert_fails.
https://github.com/vim/vim/commit/28ee892ac4197421b3317f195512ca64cc56a5b4
Cherry-pick no_wait_return from patch 9.0.0846.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 2470fd326b..3f27302617 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -572,7 +572,8 @@ void check_for_delay(bool check_msg_scroll) { if ((emsg_on_display || (check_msg_scroll && msg_scroll)) && !did_wait_return - && emsg_silent == 0) { + && emsg_silent == 0 + && !in_assert_fails) { ui_flush(); os_delay(1006L, true); emsg_on_display = false; |