aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-12 06:44:06 -04:00
Code Activity

patch 8.0.1513: the jumplist is not always properly cleaned up

Browse Source 
Problem:    The jumplist is not always properly cleaned up.
Solution:   Call fname2fnum() before cleanup_jumplist(). (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2018-02-13 13:33:29 +01:00
parent e4db7aedab
commit 4867974137
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mark.c
View File

@@ -221,7 +221,7 @@ movemark(int count)
pos_T *pos;
xfmark_T *jmp;
cleanup_jumplist(curwin);
cleanup_jumplist(curwin, TRUE);
if (curwin->w_jumplistlen == 0) /* nothing to jump to */
return (pos_T *)NULL;
@@ -891,7 +891,7 @@ ex_jumps(exarg_T *eap UNUSED)
int i;
char_u *name;
cleanup_jumplist(curwin);
cleanup_jumplist(curwin, TRUE);
/* Highlight title */
MSG_PUTS_TITLE(_("\n jump line col file/text"));
@@ -899,8 +899,6 @@ ex_jumps(exarg_T *eap UNUSED)
{
if (curwin->w_jumplist[i].fmark.mark.lnum != 0)
{
if (curwin->w_jumplist[i].fmark.fnum == 0)
fname2fnum(&curwin->w_jumplist[i]);
name = fm_getname(&curwin->w_jumplist[i].fmark, 16);
if (name == NULL) /* file name not available */
continue;
@@ -1303,13 +1301,28 @@ mark_col_adjust(
/*
* When deleting lines, this may create duplicate marks in the
* jumplist. They will be removed here for the specified window.
* When "loadfiles" is TRUE first ensure entries have the "fnum" field set
* (this may be a bit slow).
*/
void
cleanup_jumplist(win_T *wp)
cleanup_jumplist(win_T *wp, int loadfiles)
{
int i;
int from, to;
if (loadfiles)
{
/* If specified, load all the files from the jump list. This is
* needed to properly clean up duplicate entries, but will take some
* time. */
for (i = 0; i < wp->w_jumplistlen; ++i)
{
if ((wp->w_jumplist[i].fmark.fnum == 0) &&
(wp->w_jumplist[i].fmark.mark.lnum != 0))
fname2fnum(&wp->w_jumplist[i]);
}
}
to = 0;
for (from = 0; from < wp->w_jumplistlen; ++from)
{
@@ -1738,7 +1751,7 @@ write_viminfo_filemarks(FILE *fp)
/* Write the jumplist with -' */
fputs(_("\n# Jumplist (newest first):\n"), fp);
setpcmark(); /* add current cursor position */
cleanup_jumplist(curwin);
cleanup_jumplist(curwin, FALSE);
vi_idx = 0;
idx = curwin->w_jumplistlen - 1;
for (i = 0; i < JUMPLISTSIZE; ++i)