Mercurial > vim
comparison src/if_cscope.c @ 10346:d52d97bf675e v8.0.0068
commit https://github.com/vim/vim/commit/21662be2211675824df1771c7f169948ede40c41
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 6 14:46:44 2016 +0100
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 06 Nov 2016 15:00:05 +0100 |
parents | c036c0f636d5 |
children | 66f1b5bf3fa6 |
comparison
equal
deleted
inserted
replaced
10345:a3caf1546431 | 10346:d52d97bf675e |
---|---|
1176 } | 1176 } |
1177 return FALSE; | 1177 return FALSE; |
1178 } | 1178 } |
1179 | 1179 |
1180 # ifdef FEAT_AUTOCMD | 1180 # ifdef FEAT_AUTOCMD |
1181 if (*qfpos != '0') | 1181 if (*qfpos != '0' |
1182 { | 1182 && apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope", |
1183 apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope", | 1183 curbuf->b_fname, TRUE, curbuf)) |
1184 curbuf->b_fname, TRUE, curbuf); | 1184 { |
1185 # ifdef FEAT_EVAL | 1185 # ifdef FEAT_EVAL |
1186 if (did_throw || force_abort) | 1186 if (aborting()) |
1187 return FALSE; | 1187 return FALSE; |
1188 # endif | 1188 # endif |
1189 } | 1189 } |
1190 # endif | 1190 # endif |
1191 } | 1191 } |