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.
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 623bd1d..f75d8c7 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4395,11 +4395,9 @@
#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 3c87faf..5061c97 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -1040,6 +1040,7 @@
" 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 @@
[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 a15bb3e..1e7b2a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5044,
+/**/
5043,
/**/
5042,