Mercurial > vim
changeset 29044:55ce8628cd9b v8.2.5044
patch 8.2.5044: command line test fails
Commit: https://github.com/vim/vim/commit/be99042b03edf7b8156c9adbc23516bfcf2cec0f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 30 16:01:42 2022 +0100
patch 8.2.5044: command line test fails
Problem: Command line test fails.
Solution: Also beep when cmdline win can't be opened because of locks.
Make the test not beep. Make the test pass on MS-Windows.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 30 May 2022 17:15:03 +0200 |
parents | f8d534f719dc |
children | a519aa0dbbb5 |
files | src/ex_getln.c src/testdir/test_substitute.vim src/version.c |
diffstat | 3 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4395,11 +4395,9 @@ open_cmdwin(void) #endif // Can't do this when text or buffer is locked. - if (text_or_buf_locked()) - return K_IGNORE; - // Can't do this recursively. Can't do it when typing a password. - if (cmdwin_type != 0 + if (text_or_buf_locked() + || cmdwin_type != 0 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL) || cmdline_star > 0 # endif
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1040,6 +1040,7 @@ func Test_sub_open_cmdline_win() " the error only happens in a very specific setup, run a new Vim instance to " get a clean starting point. let lines =<< trim [SCRIPT] + set vb t_vb= norm o0000000000000000000000000000000000000000000000000000 func Replace() norm q/ @@ -1052,8 +1053,8 @@ func Test_sub_open_cmdline_win() [SCRIPT] call writefile(lines, 'Xscript') if RunVim([], [], '-u NONE -S Xscript') - let messages = readfile('Xresult') - call assert_match('E565: Not allowed to change text or change window', messages[3]) + call assert_match('E565: Not allowed to change text or change window', + \ readfile('Xresult')->join('XX')) endif call delete('Xscript')