aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-11-11 17:50:52 +0800
committerGitHub <noreply@github.com>2022-11-11 17:50:52 +0800
commit0d8e8d36ec7d3f4967f27389b4b94edf3ba57433 (patch)
tree94f62c40fbb8714ab4f811682e450fd8d7affd68 /src/nvim/buffer.c
parentfc7ac688c397b5f748920597fcc70fe46e907944 (diff)
downloadrneovim-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/buffer.c')
-rw-r--r--src/nvim/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index fa0b2a83c8..78b058ea9a 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1842,7 +1842,7 @@ buf_T *buflist_new(char *ffname_arg, char *sfname_arg, linenr_T lnum, int flags)
pmap_put(handle_T)(&buffer_handles, buf->b_fnum, buf);
if (top_file_num < 0) { // wrap around (may cause duplicates)
emsg(_("W14: Warning: List of file names overflow"));
- if (emsg_silent == 0) {
+ if (emsg_silent == 0 && !in_assert_fails) {
ui_flush();
os_delay(3001L, true); // make sure it is noticed
}