IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.2081: smoothscroll may result in wrong cursor position (#25815)

Browse Source 
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:  vim/vim#12970
closes: vim/vim#13439

1bf1bf569b
This commit is contained in:
luukvbaal 2023-10-29 00:05:29 +02:00 committed by GitHub
parent 4f526b9fd8
commit f2fb05238a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/option.c
View File

@ -2534,12 +2534,10 @@ static const char *did_set_showtabline(optset_T *args FUNC_ATTR_UNUSED)
static const char *did_set_smoothscroll(optset_T *args FUNC_ATTR_UNUSED)
{
win_T *win = (win_T *)args->os_win;
if (win->w_p_sms) {
return NULL;
if (!win->w_p_sms) {
win->w_skipcol = 0;
}
win->w_skipcol = 0;
changed_line_abv_curs_win(win);
return NULL;
}
@ -2746,11 +2744,13 @@ static const char *did_set_winwidth(optset_T *args)
static const char *did_set_wrap(optset_T *args)
{
win_T *win = (win_T *)args->os_win;
// If 'wrap' is set, set w_leftcol to zero.
// Set w_leftcol or w_skipcol to zero.
if (win->w_p_wrap) {
win->w_leftcol = 0;
} else {
win->w_skipcol = 0;
}
return NULL;
}
/// Check the bounds of numeric options.

16
test/old/testdir/test_options.vim
View File

@ -2193,4 +2193,20 @@ func Test_binary_depending_options()
call delete('Xoutput_bin')
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