diff options
| -rw-r--r-- | src/nvim/move.c | 11 | ||||
| -rw-r--r-- | test/functional/legacy/scroll_opt_spec.lua | 18 | ||||
| -rw-r--r-- | test/old/testdir/test_scroll_opt.vim | 15 |
3 files changed, 40 insertions, 4 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 5934ad90e9..f859294d65 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -1826,10 +1826,13 @@ void scroll_cursor_top(int min_scroll, int always) } } check_topfill(curwin, false); - // TODO(vim): if the line doesn't fit may optimize w_skipcol - if (curwin->w_topline == curwin->w_cursor.lnum - && curwin->w_skipcol >= curwin->w_cursor.col) { - reset_skipcol(curwin); + if (curwin->w_topline == curwin->w_cursor.lnum) { + validate_virtcol(); + if (curwin->w_skipcol >= curwin->w_virtcol) { + // TODO(vim): if the line doesn't fit may optimize w_skipcol instead + // of making it zero + reset_skipcol(curwin); + } } if (curwin->w_topline != old_topline || curwin->w_skipcol != old_skipcol diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua index a5a6aded79..3b755ff3e8 100644 --- a/test/functional/legacy/scroll_opt_spec.lua +++ b/test/functional/legacy/scroll_opt_spec.lua @@ -174,6 +174,24 @@ describe('smoothscroll', function() screen:expect(s8) end) + -- oldtest: Test_smoothscroll_multibyte() + it('works with multibyte characters', function() + screen:try_resize(40, 6) + exec([[ + set scrolloff=0 smoothscroll + call setline(1, [repeat('ϛ', 45), repeat('2', 36)]) + exe "normal G35l\<C-E>k" + ]]) + screen:expect([[ + ϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛ^ϛϛϛϛϛ| + ϛϛϛϛϛ | + 222222222222222222222222222222222222 | + ~ | + ~ | + | + ]]) + end) + -- oldtest: Test_smoothscroll_number() it("works 'number' and 'cpo'+=n", function() exec([[ diff --git a/test/old/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim index f9f33b20eb..d7be074168 100644 --- a/test/old/testdir/test_scroll_opt.vim +++ b/test/old/testdir/test_scroll_opt.vim @@ -124,6 +124,21 @@ func Test_smoothscroll_CtrlE_CtrlY() call StopVimInTerminal(buf) endfunc +func Test_smoothscroll_multibyte() + CheckScreendump + + let lines =<< trim END + set scrolloff=0 smoothscroll + call setline(1, [repeat('ϛ', 45), repeat('2', 36)]) + exe "normal G35l\<C-E>k" + END + call writefile(lines, 'XSmoothMultibyte', 'D') + let buf = RunVimInTerminal('-S XSmoothMultibyte', #{rows: 6, cols: 40}) + call VerifyScreenDump(buf, 'Test_smoothscroll_multi_1', {}) + + call StopVimInTerminal(buf) +endfunc + func Test_smoothscroll_number() CheckScreendump |