diff options
| -rw-r--r-- | src/ex_getln.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_arglist.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index d02536821..d6712c126 100644 --- 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; } diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim index 620299349..4f169416a 100644 --- 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 diff --git a/src/version.c b/src/version.c index 24a1d7fd4..17ca2717d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2416, +/**/ 2415, /**/ 2414, |