Mercurial > vim
changeset 32561:f8eca24e58d6
patch 9.0.1612: "skipcol" not reset when using multi-byte characters
Commit: https://github.com/vim/vim/commit/15d4747ffd197ffa5b5a41a852a1fe93b6cc35fd
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 5 20:44:55 2023 +0100
patch 9.0.1612: "skipcol" not reset when using multi-byte characters
Problem: "skipcol" not reset when using multi-byte characters.
Solution: Compare with w_virtcol instead of w_cursor.col. (closes https://github.com/vim/vim/issues/12457)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 05 Jun 2023 21:45:04 +0200 |
| parents | 87ba01df3614 |
| children | b5d8d556ea7f |
| files | src/move.c src/testdir/dumps/Test_smoothscroll_multi_1.dump src/testdir/test_scroll_opt.vim src/version.c |
| diffstat | 4 files changed, 31 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -2414,10 +2414,14 @@ scroll_cursor_top(int min_scroll, int al } check_topfill(curwin, FALSE); #endif - // TODO: 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(); + if (curwin->w_topline == curwin->w_cursor.lnum) + { + validate_virtcol(); + if (curwin->w_skipcol >= curwin->w_virtcol) + // TODO: if the line doesn't fit may optimize w_skipcol instead + // of making it zero + reset_skipcol(); + } if (curwin->w_topline != old_topline || curwin->w_skipcol != old_skipcol #ifdef FEAT_DIFF
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smoothscroll_multi_1.dump @@ -0,0 +1,6 @@ +|ϛ+0&#ffffff0@34>ϛ@4 +@5| @34 +|2@35| @3 +|~+0#4040ff13&| @38 +|~| @38 +| +0#0000000&@21|1|,|7|1|-|3|6| @6|A|l@1|
--- a/src/testdir/test_scroll_opt.vim +++ b/src/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