diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-06-17 22:00:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 22:00:26 -0400 |
| commit | e2d3ad7bc4685c38f037a631ce345a64217c233b (patch) | |
| tree | 26b2433a9c9bb9728aa0c5226997c6d74a28876c | |
| parent | a03ffe16023faab119cefe28a4f465c9de767afd (diff) | |
| download | rneovim-e2d3ad7bc4685c38f037a631ce345a64217c233b.tar.gz rneovim-e2d3ad7bc4685c38f037a631ce345a64217c233b.tar.bz2 rneovim-e2d3ad7bc4685c38f037a631ce345a64217c233b.zip | |
vim-patch:8.2.3012: when 'rightleft' is set the line number is drawn reversed (#14839)
Problem: When 'rightleft' is set the line number is sometimes drawn
reversed.
Solution: Adjust how space is handled. (Christian Brabandt, closes vim/vim#8389,
closes vim/vim#8391)
https://github.com/vim/vim/commit/29f0dc3689eafcf7888e06d57d1cf79e62c5c148
| -rw-r--r-- | src/nvim/screen.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_number.vim | 25 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 5c494d5066..04157a0154 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2757,8 +2757,9 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, } if (wp->w_p_rl) { // reverse line numbers // like rl_mirror(), but keep the space at the end - char_u *p2 = skiptowhite(extra) - 1; - for (char_u *p1 = extra; p1 < p2; p1++, p2--) { + char_u *p2 = skipwhite(extra); + p2 = skiptowhite(p2) - 1; + for (char_u *p1 = skipwhite(extra); p1 < p2; p1++, p2--) { const int t = *p1; *p1 = *p2; *p2 = t; diff --git a/src/nvim/testdir/test_number.vim b/src/nvim/testdir/test_number.vim index 81326bce14..eaabe3f67e 100644 --- a/src/nvim/testdir/test_number.vim +++ b/src/nvim/testdir/test_number.vim @@ -1,5 +1,6 @@ " Test for 'number' and 'relativenumber' +source check.vim source view_util.vim func s:screen_lines(start, end) abort @@ -263,3 +264,27 @@ func Test_relativenumber_uninitialised() redraw bwipe! endfunc + +" Test for displaying line numbers with 'rightleft' +func Test_number_rightleft() + CheckFeature rightleft + new + setlocal number + setlocal rightleft + call setline(1, range(1, 1000)) + normal! 9Gzt + redraw! + call assert_match('^\s\+9 9$', Screenline(1)) + normal! 10Gzt + redraw! + call assert_match('^\s\+01 10$', Screenline(1)) + normal! 100Gzt + redraw! + call assert_match('^\s\+001 100$', Screenline(1)) + normal! 1000Gzt + redraw! + call assert_match('^\s\+0001 1000$', Screenline(1)) + bw! +endfunc + +" vim: shiftwidth=2 sts=2 expandtab |