Skip to content

Commit

Permalink
patch 8.2.5044: command line test fails
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
brammool committed May 30, 2022
1 parent 71223e2 commit be99042
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 2 additions & 4 deletions src/ex_getln.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/testdir/test_substitute.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5044,
/**/
5043,
/**/
Expand Down

0 comments on commit be99042

Please sign in to comment.