forked from aniani/vim
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.
This commit is contained in:
@@ -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
|
||||
|
@@ -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')
|
||||
|
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
5044,
|
||||
/**/
|
||||
5043,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user