diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-30 16:01:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-30 16:01:42 +0100 |
| commit | be99042b03edf7b8156c9adbc23516bfcf2cec0f (patch) | |
| tree | e9afac204bdbaa4e87238a3ca19ce3e69d667309 /src | |
| parent | 71223e2db87c2bf3b09aecb46266b56cda26191d (diff) | |
patch 8.2.5044: command line test failsv8.2.5044
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_getln.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_substitute.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 623bd1d498..f75d8c7a96 100644 --- 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 diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim index 3c87fafe74..5061c97261 100644 --- 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') diff --git a/src/version.c b/src/version.c index a15bb3ed8d..1e7b2a8442 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5044, +/**/ 5043, /**/ 5042, |