thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0068

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

39
src/quickfix.c
View File

@@ -3446,12 +3446,11 @@ ex_make(exarg_T *eap)
case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
default: break;
}
if (au_name != NULL)
if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL
if (did_throw || force_abort)
if (aborting())
return;
# endif
}
@@ -3970,12 +3969,13 @@ ex_vimgrep(exarg_T *eap)
case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
default: break;
}
if (au_name != NULL)
if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
if (did_throw || force_abort)
# ifdef FEAT_EVAL
if (aborting())
return;
# endif
}
#endif
@@ -4875,12 +4875,11 @@ ex_cbuffer(exarg_T *eap)
case CMD_laddbuffer: au_name = (char_u *)"laddbuffer"; break;
default: break;
}
if (au_name != NULL)
if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL
if (did_throw || force_abort)
if (aborting())
return;
# endif
}
@@ -4966,12 +4965,11 @@ ex_cexpr(exarg_T *eap)
case CMD_laddexpr: au_name = (char_u *)"laddexpr"; break;
default: break;
}
if (au_name != NULL)
if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL
if (did_throw || force_abort)
if (aborting())
return;
# endif
}
@@ -5042,12 +5040,13 @@ ex_helpgrep(exarg_T *eap)
case CMD_lhelpgrep: au_name = (char_u *)"lhelpgrep"; break;
default: break;
}
if (au_name != NULL)
if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
if (did_throw || force_abort)
# ifdef FEAT_EVAL
if (aborting())
return;
# endif
}
#endif