1
0
forked from aniani/vim

patch 8.0.0068

Problem:    Checking did_throw after executing autocommands is wrong. (Daniel
            Hahler)
Solution:   Call aborting() instead, and only when autocommands were executed.
This commit is contained in:
Bram Moolenaar
2016-11-06 14:46:44 +01:00
parent 98500fdc61
commit 21662be221
4 changed files with 42 additions and 24 deletions

View File

@@ -1178,12 +1178,12 @@ cs_find_common(
}
# ifdef FEAT_AUTOCMD
if (*qfpos != '0')
if (*qfpos != '0'
&& apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL
if (did_throw || force_abort)
if (aborting())
return FALSE;
# endif
}