diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-26 19:19:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 19:19:03 -0700 |
| commit | 479c01412242c11eab8bdbe62048b1351731bea2 (patch) | |
| tree | 3479a65a63296bfb9f928f8368d94ea80a43792d /src/nvim/quickfix.c | |
| parent | 6d8fe9b3f40d0d3f4ddeed56f592dfd2be810f7f (diff) | |
| parent | 0cf694e83e27008205b2e550a9c407a4e664750b (diff) | |
| download | rneovim-479c01412242c11eab8bdbe62048b1351731bea2.tar.gz rneovim-479c01412242c11eab8bdbe62048b1351731bea2.tar.bz2 rneovim-479c01412242c11eab8bdbe62048b1351731bea2.zip | |
Merge #11298 from janlazo/vim-8.1.2220
vim-patch:8.1.2220
Diffstat (limited to 'src/nvim/quickfix.c')
| -rw-r--r-- | src/nvim/quickfix.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 52dd3c1c98..8f891751d6 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -4152,10 +4152,15 @@ void ex_cfile(exarg_T *eap) case CMD_laddfile: au_name = (char_u *)"laddfile"; break; default: break; } - if (au_name != NULL) - apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, NULL, FALSE, curbuf); - if (*eap->arg != NUL) + if (au_name != NULL + && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, NULL, false, curbuf)) { + if (aborting()) { + return; + } + } + if (*eap->arg != NUL) { set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE, 0); + } char_u *enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc; |