aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2022-02-20 17:26:39 +0000
committerLewis Russell <lewis6991@gmail.com>2022-02-24 22:35:59 +0000
commite67cd22c38493d4dff90f6afa17bfeacd0ba953d (patch)
tree16629d4a7023183adf9d190674f99d027d7ef1e0 /src/nvim/option.c
parentfdea15723fab6a3ee96218f13669d9f2e0a6d6d7 (diff)
downloadrneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.tar.gz
rneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.tar.bz2
rneovim-e67cd22c38493d4dff90f6afa17bfeacd0ba953d.zip
fix(signcol): handle edge case with maximum value
50250542 failed to consider that the maximum passed to buf_signcols is window scoped whereas the signcols value is buffer scoped. This can lead to a bug where the signcolumn becomes incorrect if: - global signcolumn is set to auto:N - signcolumn in a window is changed locally to auto:M where M > N - the buffer has a line with M or greater signs.
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index d97a22c342..4ec6ee3148 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -8165,7 +8165,7 @@ int win_signcol_configured(win_T *wp, int *is_fixed)
}
int needed_signcols = buf_signcols(wp->w_buffer, maximum);
- int ret = MAX(minimum, needed_signcols);
+ int ret = MAX(minimum, MIN(maximum, needed_signcols));
assert(ret <= SIGN_SHOW_MAX);
return ret;
}