diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-09-16 15:43:21 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-09-16 15:43:21 +0200 |
commit | 05eb5b9cae123b138bbd23cc77e50657ece6b4ad (patch) | |
tree | c5edd589c1d36fbeeb23a24f077851d0ff8c7108 /src/highlight.c | |
parent | fb489af2ec1b181d212a8aa8151d7784b260d01b (diff) | |
download | vim-git-05eb5b9cae123b138bbd23cc77e50657ece6b4ad.tar.gz |
patch 8.2.1693: "hi def" does not work for cleared highlightv8.2.1693
Problem: "hi def" does not work for cleared highlight.
Solution: Check the "sg_cleared" flag. (Maxim Kim, closes #6956,
closes #4405)
Diffstat (limited to 'src/highlight.c')
-rw-r--r-- | src/highlight.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/highlight.c b/src/highlight.c index 6ddd44a82..017507924 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -729,7 +729,8 @@ do_highlight( if (!ends_excmd2(line, skipwhite(to_end))) { - semsg(_("E413: Too many arguments: \":highlight link %s\""), from_start); + semsg(_("E413: Too many arguments: \":highlight link %s\""), + from_start); return; } @@ -1629,7 +1630,8 @@ restore_cterm_colors(void) static int hl_has_settings(int idx, int check_link) { - return ( HL_TABLE()[idx].sg_term_attr != 0 + return HL_TABLE()[idx].sg_cleared == 0 + && ( HL_TABLE()[idx].sg_term_attr != 0 || HL_TABLE()[idx].sg_cterm_attr != 0 || HL_TABLE()[idx].sg_cterm_fg != 0 || HL_TABLE()[idx].sg_cterm_bg != 0 |