aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-07-23 09:15:31 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-07-23 09:48:24 +0800
commit91c99eed540a329b7738bd2f28259f8ac0670ef2 (patch)
tree12e1583446b7c4ded682fdb083458ffb725def73 /src/nvim/eval/funcs.c
parented6bbc03af7be192e3d615f8ee761611e78d9881 (diff)
downloadrneovim-91c99eed540a329b7738bd2f28259f8ac0670ef2.tar.gz
rneovim-91c99eed540a329b7738bd2f28259f8ac0670ef2.tar.bz2
rneovim-91c99eed540a329b7738bd2f28259f8ac0670ef2.zip
vim-patch:8.2.4731: the changelist index is not remembered per buffer
Problem: The changelist index is not remembered per buffer. Solution: Keep the changelist index per window and buffer. (closes vim/vim#10135, closes vim/vim#2173) https://github.com/vim/vim/commit/db0ea7f2b00c84d84f188c9e9953c4f1887528e7 Cherry-pick FOR_ALL_BUF_WININFO from patch 8.2.0500. Cherry-pick test_changelist.vim change from patch 8.2.3795.
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 5ee499e006..dac6bb6e34 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2824,13 +2824,23 @@ static void f_getchangelist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
list_T *const l = tv_list_alloc(buf->b_changelistlen);
tv_list_append_list(rettv->vval.v_list, l);
- // The current window change list index tracks only the position in the
- // current buffer change list. For other buffers, use the change list
- // length as the current index.
- tv_list_append_number(rettv->vval.v_list,
- (buf == curwin->w_buffer)
- ? curwin->w_changelistidx
- : buf->b_changelistlen);
+ // The current window change list index tracks only the position for the
+ // current buffer. For other buffers use the stored index for the current
+ // window, or, if that's not available, the change list length.
+ int changelistindex;
+ if (buf == curwin->w_buffer) {
+ changelistindex = curwin->w_changelistidx;
+ } else {
+ wininfo_T *wip;
+
+ FOR_ALL_BUF_WININFO(buf, wip) {
+ if (wip->wi_win == curwin) {
+ break;
+ }
+ }
+ changelistindex = wip != NULL ? wip->wi_changelistidx : buf->b_changelistlen;
+ }
+ tv_list_append_number(rettv->vval.v_list, (varnumber_T)changelistindex);
for (int i = 0; i < buf->b_changelistlen; i++) {
if (buf->b_changelist[i].mark.lnum == 0) {