Mercurial > vim
diff src/syntax.c @ 11465:7cbcba782c4e v8.0.0616
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
commit https://github.com/vim/vim/commit/1615b36b91b094263240d7b555283ddf33208f62
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 4 21:06:09 2017 +0200
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Problem: When setting the cterm background with ":hi Normal" the value of
'background' may be set wrongly.
Solution: Check that the color is less than 16. Don't set 'background' when
it was set explicitly. (Lemonboy, closes #1710)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 04 Jun 2017 21:15:03 +0200 |
| parents | 918942a3b0ef |
| children | 7c42cf66d5be |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -7834,18 +7834,25 @@ do_highlight( must_redraw = CLEAR; if (color >= 0) { + int dark = -1; + if (termcap_active) term_bg_color(color); if (t_colors < 16) - i = (color == 0 || color == 4); - else - i = (color < 7 || color == 8); + dark = (color == 0 || color == 4); + /* Limit the heuristic to the standard 16 colors */ + else if (color < 16) + dark = (color < 7 || color == 8); /* Set the 'background' option if the value is * wrong. */ - if (i != (*p_bg == 'd')) + if (dark != -1 + && dark != (*p_bg == 'd') + && !option_was_set((char_u *)"bg")) + { set_option_value((char_u *)"bg", 0L, - i ? (char_u *)"dark" - : (char_u *)"light", 0); + (char_u *)(dark ? "dark" : "light"), 0); + reset_option_was_set((char_u *)"bg"); + } } } }