1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ugrid.h b/src/nvim/ugrid.h
index 268362bf1b..035074846e 100644
--- a/src/nvim/ugrid.h
+++ b/src/nvim/ugrid.h
@@ -7,21 +7,23 @@
 typedef struct ucell UCell;
 typedef struct ugrid UGrid;
 
+#define CELLBYTES (4 * (MAX_MCO+1))
+
 struct ucell {
-  char data[6 * MAX_MCO + 1];
+  char data[CELLBYTES + 1];
   HlAttrs attrs;
 };
 
 struct ugrid {
   int top, bot, left, right;
   int row, col;
-  int bg, fg;
+  HlAttrs clear_attrs;
   int width, height;
   HlAttrs attrs;
   UCell **cells;
 };
 
-#define EMPTY_ATTRS ((HlAttrs){ false, false, false, false, false, -1, -1, -1 })
+// -V:UGRID_FOREACH_CELL:625
 
 #define UGRID_FOREACH_CELL(grid, top, bot, left, right, code) \
   do { \