diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-06-21 05:15:11 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-21 11:15:11 +0200 |
| commit | 52ebe34eebf361f28b1a374399cd7e3d8201bfb2 (patch) | |
| tree | f63a610d51b3ef9b88fe3f621b117d3bc6c99c25 /src/nvim/option.c | |
| parent | 8794a551bdbc4c31ed212bbb69e9ce946e5612dd (diff) | |
| download | rneovim-52ebe34eebf361f28b1a374399cd7e3d8201bfb2.tar.gz rneovim-52ebe34eebf361f28b1a374399cd7e3d8201bfb2.tar.bz2 rneovim-52ebe34eebf361f28b1a374399cd7e3d8201bfb2.zip | |
vim-patch:8.0.0616: not always setting 'background' correctly after :hi Normal (#8606)
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 vim/vim#1710)
https://github.com/vim/vim/commit/1615b36b91b094263240d7b555283ddf33208f62
Restore reset_option_was_set(), removed in 419da839e0cbdf6251bc31dc218fa629ccc91b44
ref #8595
ref #8597
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 68b0a525f1..61570a75b1 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6599,7 +6599,7 @@ void vimrc_found(char_u *fname, char_u *envname) /// @param[in] name Option name. /// /// @return True if it was set. -static bool option_was_set(const char *name) +bool option_was_set(const char *name) { int idx; @@ -6612,6 +6612,18 @@ static bool option_was_set(const char *name) return false; } +/// Reset the flag indicating option "name" was set. +/// +/// @param[in] name Option name. +void reset_option_was_set(const char *name) +{ + const int idx = findoption(name); + + if (idx >= 0) { + options[idx].flags &= ~P_WAS_SET; + } +} + /* * fill_breakat_flags() -- called when 'breakat' changes value. */ |