aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/syntax.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/syntax.c')
-rw-r--r--src/nvim/syntax.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 63c7ffbadf..45f40e8592 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6812,15 +6812,21 @@ void do_highlight(const char *line, const bool forceit, const bool init)
if (!ui_rgb_attached()) {
must_redraw = CLEAR;
if (color >= 0) {
+ int dark = -1;
+
if (t_colors < 16) {
- i = (color == 0 || color == 4);
- } else {
- i = (color < 7 || color == 8);
+ dark = (color == 0 || color == 4);
+ } else if (color < 16) {
+ // Limit the heuristic to the standard 16 colors
+ dark = (color < 7 || color == 8);
}
// Set the 'background' option if the value is
// wrong.
- if (i != (*p_bg == 'd')) {
- set_option_value("bg", 0L, (i ? "dark" : "light"), 0);
+ if (dark != -1
+ && dark != (*p_bg == 'd')
+ && !option_was_set("bg")) {
+ set_option_value("bg", 0L, (dark ? "dark" : "light"), 0);
+ reset_option_was_set("bg");
}
}
}