Mercurial > vim

diff src/if_cscope.c @ 10346:d52d97bf675e v8.0.0068

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- 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
 	}