Mercurial > vim

comparison src/change.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 e82579016863
children 09e64e81c473
comparison
equal deleted inserted replaced
22741:8c4ba2a7a44f 22742:f7f2d73ff85e
113 113
114 // The ml_open_file() can cause an ATTENTION message. 114 // The ml_open_file() can cause an ATTENTION message.
115 // Wait two seconds, to make sure the user reads this unexpected 115 // Wait two seconds, to make sure the user reads this unexpected
116 // message. Since we could be anywhere, call wait_return() now, 116 // message. Since we could be anywhere, call wait_return() now,
117 // and don't let the emsg() set msg_scroll. 117 // and don't let the emsg() set msg_scroll.
118 if (need_wait_return && emsg_silent == 0) 118 if (need_wait_return && emsg_silent == 0 && !in_assert_fails)
119 { 119 {
120 out_flush(); 120 out_flush();
121 ui_delay(2002L, TRUE); 121 ui_delay(2002L, TRUE);
122 wait_return(TRUE); 122 wait_return(TRUE);
123 msg_scroll = save_msg_scroll; 123 msg_scroll = save_msg_scroll;