diff options
| author | Luuk van Baal <luukvbaal@gmail.com> | 2023-04-26 18:08:55 +0200 |
|---|---|---|
| committer | Luuk van Baal <luukvbaal@gmail.com> | 2023-05-02 13:11:46 +0200 |
| commit | 7dc2c087e7c2071166772dc6b167c802612112fe (patch) | |
| tree | 18905ba6aa6a5b49d4731cb1b86b367896f2c269 /src/nvim/drawline.c | |
| parent | d95697d6d4533e84bbb9d262b355ee9f71bd7452 (diff) | |
| download | rneovim-7dc2c087e7c2071166772dc6b167c802612112fe.tar.gz rneovim-7dc2c087e7c2071166772dc6b167c802612112fe.tar.bz2 rneovim-7dc2c087e7c2071166772dc6b167c802612112fe.zip | |
vim-patch:9.0.0677: breakindent test accepts wrong result
Problem: Breakindent test accepts wrong result.
Solution: Fix the number column and adjust the expected text.
https://github.com/vim/vim/commit/06618f94f1c9ed73a84ad5d6a8e1933b0b8da846
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/drawline.c')
| -rw-r--r-- | src/nvim/drawline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 35038f4717..c9cd08fedd 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -596,8 +596,7 @@ static void handle_lnum_col(win_T *wp, winlinevars_T *wlv, int num_signs, int si int sign_num_attr, int sign_cul_attr) { if ((wp->w_p_nu || wp->w_p_rnu) - && ((wlv->row == wlv->startrow + wlv->filler_lines - && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow)) + && (wlv->row == wlv->startrow + wlv->filler_lines || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) { // If 'signcolumn' is set to 'number' and a sign is present // in "lnum", then display the sign instead of the line @@ -606,7 +605,8 @@ static void handle_lnum_col(win_T *wp, winlinevars_T *wlv, int num_signs, int si get_sign_display_info(true, wp, wlv, sign_idx, sign_cul_attr); } else { // Draw the line number (empty space after wrapping). - if (wlv->row == wlv->startrow + wlv->filler_lines) { + if (wlv->row == wlv->startrow + wlv->filler_lines + && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow)) { get_line_number_str(wp, wlv->lnum, wlv->extra, sizeof(wlv->extra)); if (wp->w_skipcol > 0 && wlv->startrow == 0) { for (wlv->p_extra = wlv->extra; *wlv->p_extra == ' '; wlv->p_extra++) { |