aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 7.4.2314

Browse Source 
Problem:    No error when deleting an augroup while it's the current one.
Solution:   Disallow deleting an augroup when it's the current one.
This commit is contained in:
Bram Moolenaar
2016-09-03 16:59:06 +02:00
parent b62cc36a60
commit de653f0880
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio.c
View File

@@ -8017,6 +8017,8 @@ au_del_group(char_u *name)
i = au_find_group(name); i = au_find_group(name);
if (i == AUGROUP_ERROR) /* the group doesn't exist */ if (i == AUGROUP_ERROR) /* the group doesn't exist */
EMSG2(_("E367: No such group: \"%s\""), name); EMSG2(_("E367: No such group: \"%s\""), name);
else if (i == current_augroup)
EMSG(_("E936: Cannot delete the current group"));
else else
{ {
event_T event; event_T event;

10
src/testdir/test_autocmd.vim
View File

@@ -182,13 +182,17 @@ func Test_augroup_warning()
doautocmd VimEnter doautocmd VimEnter
redir END redir END
call assert_true(match(res, "W19:") < 0) call assert_true(match(res, "W19:") < 0)
au! VimEnter
endfunc endfunc
func Test_augroup_deleted() func Test_augroup_deleted()
" This caused a crash " This caused a crash before E936 was introduced
augroup x augroup x
call assert_fails('augroup! x', 'E936:')
au VimEnter * echo
augroup end
augroup! x augroup! x
au VimEnter * echo call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
au VimEnter au! VimEnter
endfunc endfunc

2
src/version.c
View File

@@ -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 */
/**/
2314,
/**/ /**/
2313, 2313,
/**/ /**/