diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-26 20:06:29 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-26 20:23:53 -0400 |
| commit | c3d81a490224905e3d20dc15ad3e7bd3facf9ed7 (patch) | |
| tree | e5620b154796419e3c6e498583ccceeac1c19d30 /src/nvim/quickfix.c | |
| parent | 6d8fe9b3f40d0d3f4ddeed56f592dfd2be810f7f (diff) | |
| download | rneovim-c3d81a490224905e3d20dc15ad3e7bd3facf9ed7.tar.gz rneovim-c3d81a490224905e3d20dc15ad3e7bd3facf9ed7.tar.bz2 rneovim-c3d81a490224905e3d20dc15ad3e7bd3facf9ed7.zip | |
vim-patch:8.1.2220: :cfile does not abort like other quickfix commands
Problem: :cfile does not abort like other quickfix commands.
Solution: Abort when desired. Add tests for aborting. (Yegappan Lakshmanan,
closes vim/vim#5121)
https://github.com/vim/vim/commit/6a0cc916bd3cd6c2fd88b2972c92ade225603229
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; |