forked from aniani/vim
patch 9.1.1411: crash when calling non-existing function for tabpanel
Problem: crash when calling non-existing function for tabpanel (Yamagi, after v9.1.1391) Solution: check if there was an error and if there was, set tabpanel option to empty to prevent showing errors on every redraw fixes: #17364 closes: #17375 closes: #17371 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
7c621052c3
commit
a88c5bdcce
@ -496,6 +496,7 @@ starts_with_percent_and_bang(tabpanel_T *pargs)
|
||||
{
|
||||
int len = 0;
|
||||
char_u *usefmt = p_tpl;
|
||||
int did_emsg_before = did_emsg;
|
||||
|
||||
if (usefmt == NULL)
|
||||
return NULL;
|
||||
@ -525,6 +526,13 @@ starts_with_percent_and_bang(tabpanel_T *pargs)
|
||||
usefmt = p;
|
||||
|
||||
do_unlet((char_u *)"g:tabpanel_winid", TRUE);
|
||||
|
||||
if (did_emsg > did_emsg_before)
|
||||
{
|
||||
usefmt = NULL;
|
||||
set_string_option_direct((char_u *)"tabpanel", -1, (char_u *)"",
|
||||
OPT_FREE | OPT_GLOBAL, SID_ERROR);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -521,4 +521,16 @@ function Test_tabpanel_equalalways()
|
||||
call StopVimInTerminal(buf)
|
||||
endfunc
|
||||
|
||||
function Test_tabpanel_error()
|
||||
set tabpanel=%!NonExistingFunc()
|
||||
try
|
||||
set showtabpanel=2
|
||||
redraw!
|
||||
catch /^Vim\%((\a\+)\)\=:E117:/
|
||||
endtry
|
||||
call assert_true(empty(&tabpanel))
|
||||
set tabpanel&vim
|
||||
set showtabpanel&vim
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@ -709,6 +709,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1411,
|
||||
/**/
|
||||
1410,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user