diff options
| author | Luuk van Baal <luukvbaal@gmail.com> | 2023-10-28 21:43:31 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-28 21:43:31 +0200 |
| commit | 1bf1bf569b96d2f9b28e0cce0968ffbf2fb80aac (patch) | |
| tree | 72b7fdecf5faca63e5dd71e6506bce076b44ca43 | |
| parent | a390e984db20575dc726b4e0ebf95582265df8e7 (diff) | |
patch 9.0.2081: smoothscroll may result in wrong cursor positionv9.0.2081
Problem: With 'smoothscroll' set, "w_skipcol" is not reset when unsetting 'wrap'.
Resulting in incorrect calculation of the cursor position.
Solution: Reset "w_skipcol" when unsetting 'wrap'.
fixes: #12970
closes: #13439
Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/option.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_options.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c index 180aca221d..35529a576e 100644 --- a/src/option.c +++ b/src/option.c @@ -4081,11 +4081,9 @@ did_set_showtabline(optset_T *args UNUSED) char * did_set_smoothscroll(optset_T *args UNUSED) { - if (curwin->w_p_sms) - return NULL; + if (!curwin->w_p_sms) + curwin->w_skipcol = 0; - curwin->w_skipcol = 0; - changed_line_abv_curs(); return NULL; } @@ -4535,9 +4533,12 @@ did_set_winwidth(optset_T *args UNUSED) char * did_set_wrap(optset_T *args UNUSED) { - // If 'wrap' is set, set w_leftcol to zero. + // Set w_leftcol or w_skipcol to zero. if (curwin->w_p_wrap) curwin->w_leftcol = 0; + else + curwin->w_skipcol = 0; + return NULL; } diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index ef2d3bd4da..f65654dc5c 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -2207,4 +2207,20 @@ func Test_set_keyprotocol() let &term = term endfunc +func Test_set_wrap() + " Unsetting 'wrap' when 'smoothscroll' is set does not result in incorrect + " cursor position. + set wrap smoothscroll scrolloff=5 + + call setline(1, ['', 'aaaa'->repeat(500)]) + 20 split + 20 vsplit + norm 2G$ + redraw + set nowrap + call assert_equal(2, winline()) + + set wrap& smoothscroll& scrolloff& +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index a75c4a675a..78c23fca65 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 */ /**/ + 2081, +/**/ 2080, /**/ 2079, |