thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1921: not possible to use the jumplist like a stack

Browse Source 
Problem:  not possible to use the jumplist like a stack
Solution: Add the 'jumpoptions' setting to make the jumplist
          a stack.

Add an option for using jumplist like tag stack

related: #7738
closes: #13134

ported from NeoVim:

- https://neovim.io/doc/user/motion.html#jumplist-stack
- neovim/neovim@39094b3
- neovim/neovim#11530
- https://vi.stackexchange.com/questions/18344/how-to-change-jumplist-behavior

Based on the feedback in the previous PR, it looks like many people like
this option.

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: butwerenotthereyet <58348703+butwerenotthereyet@users.noreply.github.com>
This commit is contained in:
Yegappan Lakshmanan
2023-09-20 20:20:04 +02:00
committed by Christian Brabandt
parent 98e68c07ce
commit 87018255e3
12 changed files with 163 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mark.c
View File

@@ -146,6 +146,16 @@ setpcmark(void)
curwin->w_prev_pcmark = curwin->w_pcmark;
curwin->w_pcmark = curwin->w_cursor;
if (jop_flags & JOP_STACK)
{
// jumpoptions=stack: if we're somewhere in the middle of the jumplist
// discard everything after the current index.
if (curwin->w_jumplistidx < curwin->w_jumplistlen - 1)
// Discard the rest of the jumplist by cutting the length down to
// contain nothing beyond the current index.
curwin->w_jumplistlen = curwin->w_jumplistidx + 1;
}
// If jumplist is full: remove oldest entry
if (++curwin->w_jumplistlen > JUMPLISTSIZE)
{
@@ -1288,6 +1298,7 @@ cleanup_jumplist(win_T *wp, int loadfiles)
{
int i;
int from, to;
int mustfree;
if (loadfiles)
{
@@ -1314,10 +1325,18 @@ cleanup_jumplist(win_T *wp, int loadfiles)
&& wp->w_jumplist[i].fmark.mark.lnum
== wp->w_jumplist[from].fmark.mark.lnum)
break;
if (i >= wp->w_jumplistlen) // no duplicate
wp->w_jumplist[to++] = wp->w_jumplist[from];
else
if (i >= wp->w_jumplistlen) // not duplicate
mustfree = FALSE;
else if (i > from + 1) // non-adjacent duplicate
// jumpoptions=stack: remove duplicates only when adjacent.
mustfree = !(jop_flags & JOP_STACK);
else // adjacent duplicate
mustfree = TRUE;
if (mustfree)
vim_free(wp->w_jumplist[from].fname);
else
wp->w_jumplist[to++] = wp->w_jumplist[from];
}
if (wp->w_jumplistidx == wp->w_jumplistlen)
wp->w_jumplistidx = to;