diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-06 14:46:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-06 14:46:44 +0100 |
| commit | 21662be2211675824df1771c7f169948ede40c41 (patch) | |
| tree | 581e7302d5aea00e6112561751222bd3b37a2efa /src/if_cscope.c | |
| parent | 98500fdc6119eb5f02d7a52ab6ffcac3085181be (diff) | |
patch 8.0.0068v8.0.0068
Problem: Checking did_throw after executing autocommands is wrong. (Daniel
Hahler)
Solution: Call aborting() instead, and only when autocommands were executed.
Diffstat (limited to 'src/if_cscope.c')
| -rw-r--r-- | src/if_cscope.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c index 086c829631..9e7a362b2b 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -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 } |