Mercurial > vim

comparison src/misc1.c @ 22742:f7f2d73ff85e v8.2.1919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution Commit: https://github.com/vim/vim/commit/28ee892ac4197421b3317f195512ca64cc56a5b4 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Oct 28 20:20:00 2020 +0100 patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution Problem: Assert_fails() setting emsg_silent changes normal execution. Solution: Use a separate flag in_assert_fails.
author Bram Moolenaar <Bram@vim.org>
date Wed, 28 Oct 2020 20:30:04 +0100
parents 80b4e604d1d5
children 44be09b25619
comparison
equal deleted inserted replaced
22741:8c4ba2a7a44f 22742:f7f2d73ff85e
1061 { 1061 {
1062 #ifdef FEAT_EVAL 1062 #ifdef FEAT_EVAL
1063 called_vim_beep = TRUE; 1063 called_vim_beep = TRUE;
1064 #endif 1064 #endif
1065 1065
1066 if (emsg_silent == 0) 1066 if (emsg_silent == 0 && !in_assert_fails)
1067 { 1067 {
1068 if (!((bo_flags & val) || (bo_flags & BO_ALL))) 1068 if (!((bo_flags & val) || (bo_flags & BO_ALL)))
1069 { 1069 {
1070 #ifdef ELAPSED_FUNC 1070 #ifdef ELAPSED_FUNC
1071 static int did_init = FALSE; 1071 static int did_init = FALSE;
2566 * - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f". 2566 * - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f".
2567 * - Remove any argument. E.g., "csh -f" -> "csh". 2567 * - Remove any argument. E.g., "csh -f" -> "csh".
2568 * But don't allow a space in the path, so that this works: 2568 * But don't allow a space in the path, so that this works:
2569 * "/usr/bin/csh --rcfile ~/.cshrc" 2569 * "/usr/bin/csh --rcfile ~/.cshrc"
2570 * But don't do that for Windows, it's common to have a space in the path. 2570 * But don't do that for Windows, it's common to have a space in the path.
2571 * Returns NULL when out of memory.
2571 */ 2572 */
2572 char_u * 2573 char_u *
2573 get_isolated_shell_name(void) 2574 get_isolated_shell_name(void)
2574 { 2575 {
2575 char_u *p; 2576 char_u *p;