vim-patch:8.0.0068 (#6243)

Problem:    Checking did_throw after executing autocommands is wrong. (Daniel
            Hahler)
Solution:   Call aborting() instead, and only when autocommands were executed.

21662be221
This commit is contained in:
Daniel Hahler
2017-03-11 13:56:23 +01:00
committed by Justin M. Keyes
parent d1afd434f3
commit eb8cbfc8f5
3 changed files with 41 additions and 25 deletions

View File

@@ -994,11 +994,12 @@ static int cs_find_common(char *opt, char *pat, int forceit, int verbose,
return FALSE;
}
if (*qfpos != '0') {
apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, TRUE, curbuf);
if (did_throw || force_abort)
return FALSE;
if (*qfpos != '0'
&& apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, true, curbuf)) {
if (aborting()) {
return false;
}
}
}