mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1373: wrong text displayed when using both 'linebreak' and 'list'

Browse Source 
Problem:    Wrong text displayed when using both 'linebreak' and 'list'.
Solution:   Only set "c_extra" to NUL when "p_extra" is not empty. (Hirohito
            Higashi, closes vim/vim#12065)

194555c001

Cherry-pick a change from patch 9.0.0153.

Co-authored-by: h-east <h.east.727@gmail.com>
This commit is contained in:
zeertzjq
2023-03-03 07:44:11 +08:00
parent 4a3594f60e
commit bcf077414c
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/drawline.c
View File

@@ -1691,12 +1691,9 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
} else if (foldinfo.fi_lines > 0) { } else if (foldinfo.fi_lines > 0) {
// skip writing the buffer line itself // skip writing the buffer line itself
c = NUL; c = NUL;
XFREE_CLEAR(p_extra_free);
} else { } else {
int c0; int c0;
XFREE_CLEAR(p_extra_free);
// Get a character from the line itself. // Get a character from the line itself.
c0 = c = (uint8_t)(*ptr); c0 = c = (uint8_t)(*ptr);
mb_c = c; mb_c = c;
@@ -2170,7 +2167,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
c = (n_extra == 0 && wp->w_p_lcs_chars.tab3) c = (n_extra == 0 && wp->w_p_lcs_chars.tab3)
? wp->w_p_lcs_chars.tab3 ? wp->w_p_lcs_chars.tab3
: wp->w_p_lcs_chars.tab1; : wp->w_p_lcs_chars.tab1;
if (wp->w_p_lbr && p_extra != NULL) { if (wp->w_p_lbr && p_extra != NULL && *p_extra != NUL) {
c_extra = NUL; // using p_extra from above c_extra = NUL; // using p_extra from above
} else { } else {
c_extra = wp->w_p_lcs_chars.tab2; c_extra = wp->w_p_lcs_chars.tab2;

24
src/nvim/testdir/test_listlbr.vim
View File

@@ -73,6 +73,30 @@ func Test_linebreak_with_nolist()
call s:close_windows() call s:close_windows()
endfunc endfunc
func Test_linebreak_with_list_and_number()
call s:test_windows('setl list listchars+=tab:>-')
call setline(1, ["abcdefg\thijklmnopqrstu", "v"])
let lines = s:screen_lines([1, 4], winwidth(0))
let expect_nonumber = [
\ "abcdefg>------------",
\ "hijklmnopqrstu$ ",
\ "v$ ",
\ "~ ",
\ ]
call s:compare_lines(expect_nonumber, lines)
setl number
let lines = s:screen_lines([1, 4], winwidth(0))
let expect_number = [
\ " 1 abcdefg>--------",
\ " hijklmnopqrstu$ ",
\ " 2 v$ ",
\ "~ ",
\ ]
call s:compare_lines(expect_number, lines)
call s:close_windows()
endfunc
func Test_should_break() func Test_should_break()
call s:test_windows('setl sbr=+ nolist') call s:test_windows('setl sbr=+ nolist')
call setline(1, "1\t" . repeat('a', winwidth(0)-2)) call setline(1, "1\t" . repeat('a', winwidth(0)-2))