diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-07 05:45:52 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-07-07 07:00:11 +0800 |
| commit | d4db87f4932a3a994cd5364c1cf85f0913a37070 (patch) | |
| tree | ce06952a02c3768eba6180dc24d77421176d62ff | |
| parent | 0612101c92f7043e47a1b4e80120582ff538c4f8 (diff) | |
| download | rneovim-d4db87f4932a3a994cd5364c1cf85f0913a37070.tar.gz rneovim-d4db87f4932a3a994cd5364c1cf85f0913a37070.tar.bz2 rneovim-d4db87f4932a3a994cd5364c1cf85f0913a37070.zip | |
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.
https://github.com/vim/vim/commit/be99042b03edf7b8156c9adbc23516bfcf2cec0f
| -rw-r--r-- | src/nvim/ex_getln.c | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_substitute.vim | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 51085c4fa0..7e22ed55cb 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -6612,13 +6612,8 @@ static int open_cmdwin(void) int save_cmdmsg_rl = cmdmsg_rl; // 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 - || cmdline_star > 0) { + if (text_or_buf_locked() || cmdwin_type != 0 || cmdline_star > 0) { beep_flush(); return K_IGNORE; } diff --git a/src/nvim/testdir/test_substitute.vim b/src/nvim/testdir/test_substitute.vim index bc1b3fae4b..619b63202a 100644 --- a/src/nvim/testdir/test_substitute.vim +++ b/src/nvim/testdir/test_substitute.vim @@ -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 " get a clean starting point. let lines =<< trim [SCRIPT] + set vb t_vb= norm o0000000000000000000000000000000000000000000000000000 func Replace() norm q/ @@ -892,8 +893,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') |