aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-07-23 10:15:57 +0800
committerGitHub <noreply@github.com>2022-07-23 10:15:57 +0800
commitd0ced2a127ab3974deaefcfab214b564b1ef48e7 (patch)
treee9adaa0a0c77e8d7d2b23006cf253cf572e34513 /src/nvim/buffer.c
parented6bbc03af7be192e3d615f8ee761611e78d9881 (diff)
parent9d556fc81f379aba21459bd0359e6bcd38384bfd (diff)
downloadrneovim-d0ced2a127ab3974deaefcfab214b564b1ef48e7.tar.gz
rneovim-d0ced2a127ab3974deaefcfab214b564b1ef48e7.tar.bz2
rneovim-d0ced2a127ab3974deaefcfab214b564b1ef48e7.zip
Merge pull request #19471 from zeertzjq/vim-8.2.4731
vim-patch:8.2.{4731,5035}: changelist patches
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 4830b200af..10ce893fe8 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2483,6 +2483,9 @@ void buflist_setfpos(buf_T *const buf, win_T *const win, linenr_T lnum, colnr_T
wip->wi_mark.view = mark_view_make(win->w_topline, wip->wi_mark.mark);
}
}
+ if (win != NULL) {
+ wip->wi_changelistidx = win->w_changelistidx;
+ }
if (copy_options && win != NULL) {
// Save the window-specific option values.
copy_winopt(&win->w_onebuf_opt, &wip->wi_opt);
@@ -2586,6 +2589,9 @@ void get_winopts(buf_T *buf)
} else {
copy_winopt(&curwin->w_allbuf_opt, &curwin->w_onebuf_opt);
}
+ if (wip != NULL) {
+ curwin->w_changelistidx = wip->wi_changelistidx;
+ }
if (curwin->w_float_config.style == kWinStyleMinimal) {
didset_window_options(curwin);