Mercurial > vim
changeset 20423:8c98c74176ac v8.2.0766
patch 8.2.0766: display error when using 'number' and 'breakindent'
Commit: https://github.com/vim/vim/commit/e882f7a73c8fa48707de71035eb0a7ccc6ac8548
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 16 14:07:39 2020 +0200
patch 8.2.0766: display error when using 'number' and 'breakindent'
Problem: Display error when using 'number' and 'breakindent'.
Solution: Adjust extra spaces in the first row. (Ken Takata, closes https://github.com/vim/vim/issues/6089,
closes #5986)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 16 May 2020 14:15:06 +0200 |
| parents | 01fc745921c6 |
| children | 28abbdcde76c |
| files | src/drawline.c src/testdir/test_breakindent.vim src/version.c |
| diffstat | 3 files changed, 55 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -1177,6 +1177,12 @@ win_line( c_final = NUL; n_extra = get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, FALSE)); + if (row == startrow) + { + n_extra -= win_col_off2(wp); + if (n_extra < 0) + n_extra = 0; + } if (wp->w_skipcol > 0 && wp->w_p_wrap && wp->w_briopt_sbr) need_showbreak = FALSE; // Correct end of highlighted area for 'breakindent',
--- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -696,4 +696,51 @@ func Test_breakindent19_sbr_nextpage() call s:close_windows('set breakindent& briopt& sbr&') endfunc +func Test_breakindent20_cpo_n_nextpage() + let s:input = "" + call s:test_windows('setl breakindent briopt=min:14 cpo+=n number') + call setline(1, repeat('a', 200)) + norm! 1gg + redraw! + let lines = s:screen_lines(1, 20) + let expect = [ + \ " 1 aaaaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaaaa", + \ ] + call s:compare_lines(expect, lines) + " Scroll down one screen line + setl scrolloff=5 + norm! 5gj + redraw! + let lines = s:screen_lines(1, 20) + let expect = [ + \ "--1 aaaaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaaaa", + \ ] + call s:compare_lines(expect, lines) + + setl briopt+=shift:2 + norm! 1gg + let lines = s:screen_lines(1, 20) + let expect = [ + \ " 1 aaaaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaa", + \ ] + call s:compare_lines(expect, lines) + " Scroll down one screen line + norm! 5gj + let lines = s:screen_lines(1, 20) + let expect = [ + \ "--1 aaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaa", + \ " aaaaaaaaaaaaaa", + \ ] + call s:compare_lines(expect, lines) + + call s:close_windows('set breakindent& briopt& cpo& number&') +endfunc + " vim: shiftwidth=2 sts=2 expandtab