diff options
| -rw-r--r-- | src/quickfix.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_quickfix.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 87c608580..5deaed531 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4068,10 +4068,6 @@ ex_cfile(exarg_T *eap) #endif int res; - if (eap->cmdidx == CMD_lfile || eap->cmdidx == CMD_lgetfile - || eap->cmdidx == CMD_laddfile) - wp = curwin; - #ifdef FEAT_AUTOCMD switch (eap->cmdidx) { @@ -4104,6 +4100,11 @@ ex_cfile(exarg_T *eap) if (*eap->arg != NUL) set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE, 0); + if (eap->cmdidx == CMD_lfile + || eap->cmdidx == CMD_lgetfile + || eap->cmdidx == CMD_laddfile) + wp = curwin; + /* * This function is used by the :cfile, :cgetfile and :caddfile * commands. diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 8d0c198ba..a09ec738e 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -3031,3 +3031,10 @@ func Test_ll_window_ctx() enew | only endfunc +" The following test used to crash vim +func Test_lfile_crash() + sp Xtest + au QuickFixCmdPre * bw + call assert_fails('lfile', 'E40') + au! QuickFixCmdPre +endfunc diff --git a/src/version.c b/src/version.c index 479116bd6..cba8fcfc0 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1414, +/**/ 1413, /**/ 1412, |