mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5044: command line test fails

Browse Source 
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.
be99042b03
This commit is contained in:
zeertzjq
2022-07-07 05:45:52 +08:00
parent 0612101c92
commit d4db87f493
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/ex_getln.c
View File

@@ -6612,13 +6612,8 @@ static int open_cmdwin(void)
int save_cmdmsg_rl = cmdmsg_rl; int save_cmdmsg_rl = cmdmsg_rl;
// Can't do this when text or buffer is locked. // 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. // 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 || cmdline_star > 0) {
|| cmdline_star > 0) {
beep_flush(); beep_flush();
return K_IGNORE; return K_IGNORE;
} }

5
src/nvim/testdir/test_substitute.vim
View File

@@ -880,6 +880,7 @@ func Test_sub_open_cmdline_win()
" the error only happens in a very specific setup, run a new Vim instance to " the error only happens in a very specific setup, run a new Vim instance to
" get a clean starting point. " get a clean starting point.
let lines =<< trim [SCRIPT] let lines =<< trim [SCRIPT]
set vb t_vb=
norm o0000000000000000000000000000000000000000000000000000 norm o0000000000000000000000000000000000000000000000000000
func Replace() func Replace()
norm q/ norm q/
@@ -892,8 +893,8 @@ func Test_sub_open_cmdline_win()
[SCRIPT] [SCRIPT]
call writefile(lines, 'Xscript') call writefile(lines, 'Xscript')
if RunVim([], [], '-u NONE -S Xscript') if RunVim([], [], '-u NONE -S Xscript')
let messages = readfile('Xresult') call assert_match('E565: Not allowed to change text or change window',
call assert_match('E565: Not allowed to change text or change window', messages[3]) \ readfile('Xresult')->join('XX'))
endif endif
call delete('Xscript') call delete('Xscript')