Mercurial > vim
changeset 30693:a59a8ce13129 v9.0.0681
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Commit: https://github.com/vim/vim/commit/0937b9fb244949b7ce9bfcf8398d7495b9b6aa85
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 6 21:24:34 2022 +0100
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Problem: "<<<" shows for 'smoothscroll' even when 'showbreak is set.
Solution: When 'showbreak' is set do not display "<<<".
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 06 Oct 2022 22:30:03 +0200 |
| parents | bfe956ad9520 |
| children | 8639be6a4c8d |
| files | src/drawline.c src/testdir/test_breakindent.vim src/testdir/test_listlbr_utf8.vim src/version.c |
| diffstat | 4 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -745,12 +745,17 @@ text_prop_position( /* * Call screen_line() using values from "wlv". - * Also takes care of putting "<<<" on the first line for 'smoothscroll'. + * Also takes care of putting "<<<" on the first line for 'smoothscroll' + * when 'showbreak' is not set. */ static void wlv_screen_line(win_T *wp, winlinevars_T *wlv, int negative_width) { - if (wlv->row == 0 && wp->w_skipcol > 0) + if (wlv->row == 0 && wp->w_skipcol > 0 +#if defined(FEAT_LINEBREAK) + && *get_showbreak_value(wp) == NUL +#endif + ) { int off = (int)(current_ScreenLine - ScreenLines);
--- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -660,7 +660,7 @@ func Test_breakindent19_sbr_nextpage() norm! 5gj let lines = s:screen_lines(1, 20) let expect = [ - \ "<<<aaaaaaaaaaaaaaaaa", + \ ">aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ]
--- a/src/testdir/test_listlbr_utf8.vim +++ b/src/testdir/test_listlbr_utf8.vim @@ -167,7 +167,7 @@ func Test_visual_block_and_selection_exc exe "norm! $3B\<C-v>eAx\<Esc>" let lines = s:screen_lines([1, 10], winwidth(0)) let expect = [ -\ "<<<obar foobar ", +\ "+foobar foobar ", \ "+foobar foobar ", \ "+foobar foobar ", \ "+foobar foobar ",