# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1653923703 -7200
# Node ID 55ce8628cd9bcdb85e5a164d3c0d360f6800ffb6
# Parent  f8d534f719dc91881b49e8b1a25d1e3289fc525e
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.

diff --git a/src/ex_getln.c b/src/ex_getln.c
--- 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
--- 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
--- 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,