diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-09-20 20:20:04 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-20 20:25:17 +0200 |
| commit | 87018255e3ad0f4dfa03e20318836d24af721caf (patch) | |
| tree | 132b551bd3ecddf43ae2d81ac23bfbbbe0e2177f /src/mark.c | |
| parent | 98e68c07ce229148c994a42ead9f010b0d0a1be4 (diff) | |
patch 9.0.1921: not possible to use the jumplist like a stackv9.0.1921
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>
Diffstat (limited to 'src/mark.c')
| -rw-r--r-- | src/mark.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/mark.c b/src/mark.c index b3c644b14b..22e3c62575 100644 --- a/src/mark.c +++ b/src/mark.c @@ -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; |