diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-01-16 17:22:38 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-16 17:22:38 +0100 |
| commit | ac4cffc6d9d307778d8a2945adab70244470bbb8 (patch) | |
| tree | 391cdcd7b31b65dc5b66d7a9c76fcba454f63112 /src | |
| parent | 96958366ad6159efe708b694055320ed19357e61 (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')
| -rw-r--r-- | src/evalvars.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 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 { diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index c20ff48c62..a397f70752 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -4215,4 +4215,22 @@ func Test_popup_close_callback_recursive() set maxfuncdepth& endfunc +func Test_popupwin_setbufvar_changing_window_view() + " Test for Github Issue https://github.com/vim/vim/issues/13863 + " using setbufvar(buf, '&option') should not scroll + " the current window + 20new + call append(0, range(1, 25)) + setlocal scrollbind + norm! G + let topline = winsaveview()['topline'] + call setbufvar(winbufnr(popup_atcursor(['foobar'], {})), '&syntax', 'python') + " close popup + call popup_clear() + call assert_equal(topline, winsaveview()['topline']) + + " clean up + bw! +endfunc + " vim: shiftwidth=2 sts=2 diff --git a/src/version.c b/src/version.c index 9f80e8276b..425d609eb6 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 34, +/**/ 33, /**/ 32, |