1 files changed, 24 insertions, 17 deletions

diff --git a/src/nvim/highlight.c b/src/nvim/highlight.c
index 15c3d0eb7b..f11880cb2b 100644
--- a/src/nvim/highlight.c
+++ b/src/nvim/highlight.c
@@ -106,14 +106,19 @@ static int get_attr_entry(HlEntry entry)
 /// When a UI connects, we need to send it the table of highlights used so far.
 void ui_send_all_hls(UI *ui)
 {
-  if (!ui->hl_attr_define) {
-    return;
+  if (ui->hl_attr_define) {
+    for (size_t i = 1; i < kv_size(attr_entries); i++) {
+      Array inspect = hl_inspect((int)i);
+      ui->hl_attr_define(ui, (Integer)i, kv_A(attr_entries, i).attr,
+                         kv_A(attr_entries, i).attr, inspect);
+      api_free_array(inspect);
+    }
   }
-  for (size_t i = 1; i < kv_size(attr_entries); i++) {
-    Array inspect = hl_inspect((int)i);
-    ui->hl_attr_define(ui, (Integer)i, kv_A(attr_entries, i).attr,
-                       kv_A(attr_entries, i).attr, inspect);
-    api_free_array(inspect);
+  if (ui->hl_group_set) {
+    for (size_t hlf = 0; hlf < HLF_COUNT; hlf++) {
+      ui->hl_group_set(ui, cstr_as_string((char *)hlf_names[hlf]),
+                       highlight_attr[hlf]);
+    }
   }
 }
 
@@ -141,10 +146,12 @@ int hl_get_ui_attr(int idx, int final_id, bool optional)
   HlAttrs attrs = HLATTRS_INIT;
   bool available = false;
 
-  int syn_attr = syn_id2attr(final_id);
-  if (syn_attr != 0) {
-    attrs = syn_attr2entry(syn_attr);
-    available = true;
+  if (final_id > 0) {
+    int syn_attr = syn_id2attr(final_id);
+    if (syn_attr != 0) {
+      attrs = syn_attr2entry(syn_attr);
+      available = true;
+    }
   }
 
   if (HLF_PNI <= idx && idx <= HLF_PST) {
@@ -176,15 +183,14 @@ void update_window_hl(win_T *wp, bool invalid)
 
   // determine window specific background set in 'winhighlight'
   bool float_win = wp->w_floating && !wp->w_float_config.external;
-  if (wp != curwin && wp->w_hl_ids[HLF_INACTIVE] > 0) {
+  if (wp != curwin && wp->w_hl_ids[HLF_INACTIVE] != 0) {
     wp->w_hl_attr_normal = hl_get_ui_attr(HLF_INACTIVE,
                                           wp->w_hl_ids[HLF_INACTIVE],
                                           !has_blend);
-  } else if (float_win && wp->w_hl_ids[HLF_NFLOAT] > 0) {
+  } else if (float_win && wp->w_hl_ids[HLF_NFLOAT] != 0) {
     wp->w_hl_attr_normal = hl_get_ui_attr(HLF_NFLOAT,
-    // 'cursorline'
                                           wp->w_hl_ids[HLF_NFLOAT], !has_blend);
-  } else if (wp->w_hl_id_normal > 0) {
+  } else if (wp->w_hl_id_normal != 0) {
     wp->w_hl_attr_normal = hl_get_ui_attr(-1, wp->w_hl_id_normal, !has_blend);
   } else {
     wp->w_hl_attr_normal = float_win ? HL_ATTR(HLF_NFLOAT) : 0;
@@ -199,14 +205,14 @@ void update_window_hl(win_T *wp, bool invalid)
     }
   }
 
-  if (wp != curwin) {
+  if (wp != curwin && wp->w_hl_ids[HLF_INACTIVE] == 0) {
     wp->w_hl_attr_normal = hl_combine_attr(HL_ATTR(HLF_INACTIVE),
                                            wp->w_hl_attr_normal);
   }
 
   for (int hlf = 0; hlf < (int)HLF_COUNT; hlf++) {
     int attr;
-    if (wp->w_hl_ids[hlf] > 0) {
+    if (wp->w_hl_ids[hlf] != 0) {
       attr = hl_get_ui_attr(hlf, wp->w_hl_ids[hlf], false);
     } else {
       attr = HL_ATTR(hlf);
@@ -250,6 +256,7 @@ void clear_hl_tables(bool reinit)
     map_clear(int, int)(combine_attr_entries);
     map_clear(int, int)(blend_attr_entries);
     map_clear(int, int)(blendthrough_attr_entries);
+    memset(highlight_attr_last, -1, sizeof(highlight_attr_last));
     highlight_attr_set_all();
     highlight_changed();
     screen_invalidate_highlights();