forked from aniani/vim
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.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2416,
|
||||
/**/
|
||||
2415,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user