diff options
| author | KunMing Xie <qqzz014@gmail.com> | 2017-10-07 23:20:34 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-10-07 17:20:34 +0200 |
| commit | e3ca1e604630d930ddc49fccb9a1541d381b1915 (patch) | |
| tree | 6e1d86e73bf969bb443269285914fbb72367bb27 /src | |
| parent | c0e45d97b0cbc700cd6f2b9733c15875339262df (diff) | |
| download | rneovim-e3ca1e604630d930ddc49fccb9a1541d381b1915.tar.gz rneovim-e3ca1e604630d930ddc49fccb9a1541d381b1915.tar.bz2 rneovim-e3ca1e604630d930ddc49fccb9a1541d381b1915.zip | |
vim-patch:8.0.0142 (#7335)
see also #7082
Problem: Normal colors are wrong with 'termguicolors'.
Solution: Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes vim/vim#1344)
https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/syntax.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index ddc3f5c27b..8de81f02df 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -6847,8 +6847,6 @@ int hl_combine_attr(int char_attr, int prim_attr) if (char_aep != NULL) { // Copy all attributes from char_aep to the new entry new_en = *char_aep; - } else { - memset(&new_en, 0, sizeof(new_en)); } spell_aep = syn_cterm_attr2entry(prim_attr); diff --git a/src/nvim/version.c b/src/nvim/version.c index 8bcf8c7a59..8015d7520d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -961,7 +961,7 @@ static const int included_patches[] = { // 145 NA // 144 NA 143, - // 142, + 142, // 141, // 140, // 139 NA |