diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-24 00:29:38 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-24 00:32:43 +0300 |
| commit | 6b45dbca0429c52cb70908497bc7a0fed9db2d8d (patch) | |
| tree | 6e176aa38cf213ebda85da57523af1ddd3d3e979 /src | |
| parent | dee78a4095a27369e428572f74f7b64bcc5f670e (diff) | |
| download | rneovim-6b45dbca0429c52cb70908497bc7a0fed9db2d8d.tar.gz rneovim-6b45dbca0429c52cb70908497bc7a0fed9db2d8d.tar.bz2 rneovim-6b45dbca0429c52cb70908497bc7a0fed9db2d8d.zip | |
mark: Make sure that jumplist item will not have zero lnum
Fixes #7169
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/mark.c | 4 | ||||
| -rw-r--r-- | src/nvim/shada.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 1ba400972c..3cd26a5bf7 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -171,6 +171,10 @@ void setpcmark(void) curwin->w_prev_pcmark = curwin->w_pcmark; curwin->w_pcmark = curwin->w_cursor; + if (curwin->w_pcmark.lnum == 0) { + curwin->w_pcmark.lnum = 1; + } + /* If jumplist is full: remove oldest entry */ if (++curwin->w_jumplistlen > JUMPLISTSIZE) { curwin->w_jumplistlen = JUMPLISTSIZE; diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 6bf816bb74..ce9303f14d 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2557,6 +2557,12 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, xfmark_T fm; jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm); + if (fm.fmark.mark.lnum == 0) { + iemsgf("ShaDa: mark lnum zero (ji:%p, js:%p, len:%i)", + (void *)jump_iter, (void *)&curwin->w_jumplist[0], + curwin->w_jumplistlen); + continue; + } const buf_T *const buf = (fm.fmark.fnum == 0 ? NULL : buflist_findnr(fm.fmark.fnum)); |