Mercurial > vim
changeset 23750:d98dcbc57f7f v8.2.2416
patch 8.2.2416: may get stuck in command line window state
Commit: https://github.com/vim/vim/commit/bed72df3e61a8908ed6324212595118f305dded0
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 27 20:34:29 2021 +0100
patch 8.2.2416: may get stuck in command line window state
Problem: May get stuck in command line window state.
Solution: Reset "cmdwin_type" when editing buffer fails. Make arglist test
pass on MS-Windows.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 27 Jan 2021 20:45:04 +0100 |
parents | 7ac205554b4f |
children | 134485c14630 |
files | src/ex_getln.c src/testdir/test_arglist.vim src/version.c |
diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4214,6 +4214,7 @@ open_cmdwin(void) // Some autocommand messed it up? win_close(curwin, TRUE); ga_clear(&winsizes); + cmdwin_type = 0; return Ctrl_C; }
--- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -563,12 +563,18 @@ endfunc " Test for ":all" not working when in the cmdline window func Test_all_not_allowed_from_cmdwin() CheckFeature cmdwin - " TODO: why does this hang on Windows? - CheckNotMSWindows au BufEnter * all next x - call assert_fails(":norm 7q?print\<CR>", 'E11:') + " Use try/catch here, somehow assert_fails() doesn't work on MS-Windows + " console. + let caught = 'no' + try + exe ":norm! 7q?apat\<CR>" + catch /E11:/ + let caught = 'yes' + endtry + call assert_equal('yes', caught) au! BufEnter endfunc