diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-02-21 07:02:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-21 07:02:49 +0800 |
| commit | 99a6cbe5409dc296d6a5597733d92f63d8bca27e (patch) | |
| tree | 2a1e48e513631d527057b0700e5650172748745a /src | |
| parent | e16bec41b6505678d640755cebe8ec320dec2d45 (diff) | |
| download | rneovim-99a6cbe5409dc296d6a5597733d92f63d8bca27e.tar.gz rneovim-99a6cbe5409dc296d6a5597733d92f63d8bca27e.tar.bz2 rneovim-99a6cbe5409dc296d6a5597733d92f63d8bca27e.zip | |
vim-patch:9.1.1124: No test for 'listchars' "precedes" with double-width char (#32541)
Problem: No test for 'listchars' "precedes" with double-width char.
Solution: Add a test and fix a typo in code (zeertzjq).
closes: vim/vim#16675
https://github.com/vim/vim/commit/08a83a033a32c0f5bc42eaa63162c21c369cb4ae
Cherry-pick test_listchars.vim changes from patch 9.0.0625.
Fix a regression from #30014 by moving the mb_schar assignment after the
double-width check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index c2a14bdfd5..dc5dbb958a 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2576,15 +2576,15 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s // Handle the case where we are in column 0 but not on the first // character of the line and the user wants us to show us a - // special character (via 'listchars' option "precedes:<char>". + // special character (via 'listchars' option "precedes:<char>"). if (lcs_prec_todo != NUL && wp->w_p_list && (wp->w_p_wrap ? (wp->w_skipcol > 0 && wlv.row == 0) : wp->w_leftcol > 0) && wlv.filler_todo <= 0 && mb_schar != NUL) { - mb_schar = wp->w_p_lcs_chars.prec; lcs_prec_todo = NUL; - if (schar_cells(mb_schar) > 1) { + // TODO(zeertzjq): handle the n_extra > 0 case + if (schar_cells(mb_schar) > 1 && wlv.n_extra == 0) { // Double-width character being overwritten by the "precedes" // character, need to fill up half the character. wlv.sc_extra = schar_from_ascii(MB_FILLER_CHAR); @@ -2593,6 +2593,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s wlv.n_attr = 2; wlv.extra_attr = win_hl_attr(wp, HLF_AT); } + mb_schar = wp->w_p_lcs_chars.prec; mb_c = schar_get_first_codepoint(mb_schar); saved_attr3 = wlv.char_attr; // save current attr wlv.char_attr = win_hl_attr(wp, HLF_AT); // overwriting char_attr |