Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-11-04 10:01:09 +00:00
commit 679bbdcf8f

2
grid.c
View File

@ -84,7 +84,7 @@ grid_need_extended_cell(const struct grid_cell_entry *gce,
return (1); return (1);
if (gc->attr > 0xff) if (gc->attr > 0xff)
return (1); return (1);
if (gc->data.size != 1 || gc->data.width != 1) if (gc->data.size > 1 || gc->data.width > 1)
return (1); return (1);
if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB)) if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB))
return (1); return (1);