diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-11-18 15:04:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 15:04:14 +0100 |
| commit | df87266b23b32b96d1e3d4d26eb721a9dd63c2a4 (patch) | |
| tree | ef277cb1f5aad32d85313a1044196df640074d32 /src/nvim/api/vim.c | |
| parent | cdc8bacc7945da816738e330555fa85d3ffffd56 (diff) | |
| parent | c4afb9788c4f139eb2e3b7aa4d6a6a20b67ba156 (diff) | |
| download | rneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.tar.gz rneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.tar.bz2 rneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.zip | |
Merge pull request #25724 from luukvbaal/signmerge
refactor(sign): move legacy signs to extmarks
Diffstat (limited to 'src/nvim/api/vim.c')
| -rw-r--r-- | src/nvim/api/vim.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 1d5898c488..88cbdbe1de 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -2196,13 +2196,12 @@ Dictionary nvim_eval_statusline(String str, Dict(eval_statusline) *opts, Error * } } if (statuscol_lnum) { - HlPriId line = { 0 }; - HlPriId cul = { 0 }; - HlPriId num = { 0 }; + int line_id = 0; + int cul_id = 0; + int num_id = 0; linenr_T lnum = statuscol_lnum; - int num_signs = buf_get_signattrs(wp->w_buffer, lnum, sattrs, &num, &line, &cul); - decor_redraw_signs(wp->w_buffer, lnum - 1, &num_signs, sattrs, &num, &line, &cul); wp->w_scwidth = win_signcol_count(wp); + decor_redraw_signs(wp, wp->w_buffer, lnum - 1, sattrs, &line_id, &cul_id, &num_id); statuscol.sattrs = sattrs; statuscol.foldinfo = fold_info(wp, lnum); @@ -2215,9 +2214,9 @@ Dictionary nvim_eval_statusline(String str, Dict(eval_statusline) *opts, Error * statuscol.use_cul = lnum == wp->w_cursorline && (wp->w_p_culopt_flags & CULOPT_NBR); } - statuscol.sign_cul_id = statuscol.use_cul ? cul.hl_id : 0; - if (num.hl_id) { - stc_hl_id = num.hl_id; + statuscol.sign_cul_id = statuscol.use_cul ? cul_id : 0; + if (num_id) { + stc_hl_id = num_id; } else if (statuscol.use_cul) { stc_hl_id = HLF_CLN + 1; } else if (wp->w_p_rnu) { |