summaryrefslogtreecommitdiffstats
path: root/src/evalvars.c
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2024-01-16 17:22:38 +0100
committerChristian Brabandt <cb@256bit.org>2024-01-16 17:22:38 +0100
commitac4cffc6d9d307778d8a2945adab70244470bbb8 (patch)
tree391cdcd7b31b65dc5b66d7a9c76fcba454f63112 /src/evalvars.c
parent96958366ad6159efe708b694055320ed19357e61 (diff)
patch 9.1.0034: Window scrolls unexpectedly when 'scrollbind' is setv9.1.0034
Problem: Window may unexpectedly scroll when 'scrollbind' is set and setting a buffer-local option using setbufvar() (Boris Staletic) Solution: Save and restore the windows topline before opening the popup window. fixes: #13863 closes: #13869 Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/evalvars.c')
-rw-r--r--src/evalvars.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index 8e42c5a307..cbcf2a707e 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -4924,6 +4924,10 @@ f_setbufvar(typval_T *argvars, typval_T *rettv UNUSED)
if (*varname == '&')
{
aco_save_T aco;
+ // safe the current window position, it could
+ // change because of 'scrollbind' window-local
+ // options
+ linenr_T old_topline = curwin->w_topline;
// Set curbuf to be our buf, temporarily.
aucmd_prepbuf(&aco, buf);
@@ -4935,6 +4939,7 @@ f_setbufvar(typval_T *argvars, typval_T *rettv UNUSED)
// reset notion of buffer
aucmd_restbuf(&aco);
}
+ curwin->w_topline = old_topline;
}
else
{