mirror of
https://github.com/vim/vim.git
synced 2025-09-29 04:34:16 -04:00
patch 7.4.2300
Problem: Get warning for deleting autocommand group when the autocommand using the group is scheduled for deletion. (Pavol Juhas) Solution: Check for deleted autocommand.
This commit is contained in:
@@ -8018,7 +8018,7 @@ au_del_group(char_u *name)
|
|||||||
event = (event_T)((int)event + 1))
|
event = (event_T)((int)event + 1))
|
||||||
{
|
{
|
||||||
for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next)
|
for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next)
|
||||||
if (ap->group == i)
|
if (ap->group == i && ap->pat != NULL)
|
||||||
{
|
{
|
||||||
give_warning((char_u *)_("W19: Deleting augroup that is still in use"), TRUE);
|
give_warning((char_u *)_("W19: Deleting augroup that is still in use"), TRUE);
|
||||||
in_use = TRUE;
|
in_use = TRUE;
|
||||||
|
@@ -152,6 +152,11 @@ func Test_early_bar()
|
|||||||
call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
|
call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func RemoveGroup()
|
||||||
|
autocmd! StartOK
|
||||||
|
augroup! StartOK
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_augroup_warning()
|
func Test_augroup_warning()
|
||||||
augroup TheWarning
|
augroup TheWarning
|
||||||
au VimEnter * echo 'entering'
|
au VimEnter * echo 'entering'
|
||||||
@@ -167,4 +172,14 @@ func Test_augroup_warning()
|
|||||||
augroup Another
|
augroup Another
|
||||||
augroup END
|
augroup END
|
||||||
call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
|
call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
|
||||||
|
|
||||||
|
" no warning for postpone aucmd delete
|
||||||
|
augroup StartOK
|
||||||
|
au VimEnter * call RemoveGroup()
|
||||||
|
augroup END
|
||||||
|
call assert_true(match(execute('au VimEnter'), "StartOK.*VimEnter") >= 0)
|
||||||
|
redir => res
|
||||||
|
doautocmd VimEnter
|
||||||
|
redir END
|
||||||
|
call assert_true(match(res, "W19:") < 0)
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -763,6 +763,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2300,
|
||||||
/**/
|
/**/
|
||||||
2299,
|
2299,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user