Permalink
Browse files

patch 7.4.2314

Problem:    No error when deleting an augroup while it's the current one.
Solution:   Disallow deleting an augroup when it's the current one.
  • Loading branch information...
1 parent b62cc36 commit de653f08805dde14424d417502a0480a6ad292f8 @brammool brammool committed Sep 3, 2016
Showing with 11 additions and 3 deletions.
  1. +2 −0 src/fileio.c
  2. +7 −3 src/testdir/test_autocmd.vim
  3. +2 −0 src/version.c
View
@@ -8017,6 +8017,8 @@ au_del_group(char_u *name)
i = au_find_group(name);
if (i == AUGROUP_ERROR) /* the group doesn't exist */
EMSG2(_("E367: No such group: \"%s\""), name);
+ else if (i == current_augroup)
+ EMSG(_("E936: Cannot delete the current group"));
else
{
event_T event;
@@ -182,13 +182,17 @@ func Test_augroup_warning()
doautocmd VimEnter
redir END
call assert_true(match(res, "W19:") < 0)
+ au! VimEnter
endfunc
func Test_augroup_deleted()
- " This caused a crash
+ " This caused a crash before E936 was introduced
augroup x
+ call assert_fails('augroup! x', 'E936:')
+ au VimEnter * echo
+ augroup end
augroup! x
- au VimEnter * echo
- au VimEnter
+ call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+ au! VimEnter
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2314,
+/**/
2313,
/**/
2312,

0 comments on commit de653f0

Please sign in to comment.