diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-05-19 08:34:04 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-05-19 23:15:47 -0400 |
| commit | 4aad4c053366592f9604ecc6d3a1348005bf2ce7 (patch) | |
| tree | 7c02798b707e1272611bac7d6fc05f0572a11946 /src/nvim/eval.c | |
| parent | d6d9596b38f544faa23d2c831aa84a5d15ffa972 (diff) | |
| download | rneovim-4aad4c053366592f9604ecc6d3a1348005bf2ce7.tar.gz rneovim-4aad4c053366592f9604ecc6d3a1348005bf2ce7.tar.bz2 rneovim-4aad4c053366592f9604ecc6d3a1348005bf2ce7.zip | |
vim-patch:8.0.1513: the jumplist is not always properly cleaned up
Problem: The jumplist is not always properly cleaned up.
Solution: Call fname2fnum() before cleanup_jumplist(). (Yegappan Lakshmanan)
https://github.com/vim/vim/commit/486797413791f6be12dcec6e5faf4f952e4647ae
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 5c1c722a61..a7b74b322f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10064,14 +10064,12 @@ static void f_getjumplist(typval_T *argvars, typval_T *rettv, FunPtr fptr) tv_list_append_list(rettv->vval.v_list, l); tv_list_append_number(rettv->vval.v_list, wp->w_jumplistidx); - cleanup_jumplist(wp); + cleanup_jumplist(wp, true); + for (int i = 0; i < wp->w_jumplistlen; i++) { if (wp->w_jumplist[i].fmark.mark.lnum == 0) { continue; } - if (wp->w_jumplist[i].fmark.fnum == 0) { - fname2fnum(&wp->w_jumplist[i]); - } dict_T *const d = tv_dict_alloc(); tv_list_append_dict(l, d); tv_dict_add_nr(d, S_LEN("lnum"), wp->w_jumplist[i].fmark.mark.lnum); |