diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-28 20:20:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-28 20:20:00 +0100 |
| commit | 28ee892ac4197421b3317f195512ca64cc56a5b4 (patch) | |
| tree | 0a9eb799ec0e55a32600cc604cea653d9b91f322 /src/misc1.c | |
| parent | 3e2534ed1a6557445747e6c1439ad26ec8eabfc4 (diff) | |
| download | vim-git-28ee892ac4197421b3317f195512ca64cc56a5b4.tar.gz | |
patch 8.2.1919: assert_fails() setting emsg_silent changes normal executionv8.2.1919
Problem: Assert_fails() setting emsg_silent changes normal execution.
Solution: Use a separate flag in_assert_fails.
Diffstat (limited to 'src/misc1.c')
| -rw-r--r-- | src/misc1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c index 058e8602d..010622ee5 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -1063,7 +1063,7 @@ vim_beep( called_vim_beep = TRUE; #endif - if (emsg_silent == 0) + if (emsg_silent == 0 && !in_assert_fails) { if (!((bo_flags & val) || (bo_flags & BO_ALL))) { @@ -2568,6 +2568,7 @@ goto_im(void) * But don't allow a space in the path, so that this works: * "/usr/bin/csh --rcfile ~/.cshrc" * But don't do that for Windows, it's common to have a space in the path. + * Returns NULL when out of memory. */ char_u * get_isolated_shell_name(void) |