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/option.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/option.c')
-rw-r--r-- | src/nvim/option.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index d3a8e2ce73..d64fb0c615 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6170,7 +6170,7 @@ bool fish_like_shell(void) /// buffer signs and on user configuration. int win_signcol_count(win_T *wp) { - return win_signcol_configured(wp, NULL); + return win_signcol_configured(wp); } /// Return true when window "wp" has no sign column. @@ -6182,14 +6182,10 @@ bool win_no_signcol(win_T *wp) } /// Return the number of requested sign columns, based on user / configuration. -int win_signcol_configured(win_T *wp, int *is_fixed) +int win_signcol_configured(win_T *wp) { const char *scl = wp->w_p_scl; - if (is_fixed) { - *is_fixed = 1; - } - if (win_no_signcol(wp)) { return 0; } @@ -6203,11 +6199,6 @@ int win_signcol_configured(win_T *wp, int *is_fixed) return 1; } - if (is_fixed) { - // auto or auto:<NUM> - *is_fixed = 0; - } - int minimum = 0, maximum = 1; if (!strncmp(scl, "auto:", 5)) { |