ui: Merge standout and reverse into one attribute

src/nvim/msgpack_rpc/remote_ui.c

@@ -249,10 +249,6 @@ static void remote_ui_highlight_set(UI *ui, HlAttrs attrs)
     PUT(hl, "bold", BOOLEAN_OBJ(true));
   }
 
-  if (attrs.standout) {
-    PUT(hl, "standout", BOOLEAN_OBJ(true));
-  }
-
   if (attrs.underline) {
     PUT(hl, "underline", BOOLEAN_OBJ(true));
   }

src/nvim/ui.c

@@ -61,7 +61,7 @@ static struct {
 } sr;
 static int current_highlight_mask = 0;
 static HlAttrs current_attrs = {
-  false, false, false, false, false, false, -1, -1
+  false, false, false, false, false, -1, -1
 };
 static bool cursor_enabled = true;
 static int height, width;
@@ -338,11 +338,10 @@ static void set_highlight_args(int mask, HlAttrs *attrs)
   }
 
   attrs->bold = mask & HL_BOLD;
-  attrs->standout = mask & HL_STANDOUT;
   attrs->underline = mask & HL_UNDERLINE;
   attrs->undercurl = mask & HL_UNDERCURL;
   attrs->italic = mask & HL_ITALIC;
-  attrs->reverse = mask & HL_INVERSE;
+  attrs->reverse = mask & (HL_INVERSE | HL_STANDOUT);
   attrs->foreground = aep && aep->fg_color >= 0 ? aep->fg_color : normal_fg;
   attrs->background = aep && aep->bg_color >= 0 ? aep->bg_color : normal_bg;
 }

src/nvim/ui.h

@@ -6,7 +6,7 @@
 #include <stdint.h>
 
 typedef struct {
-  bool bold, standout, underline, undercurl, italic, reverse;
+  bool bold, underline, undercurl, italic, reverse;
   int foreground, background;
 } HlAttrs;