Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2025-04-03 14:01:10 +01:00
2 changed files with 5 additions and 6 deletions

View File

@@ -5343,9 +5343,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
for (;;) {
grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING)
break;
if (format_is_word_separator(ws, &gc)) {
if ((~gc.flags & GRID_FLAG_PADDING) &&
format_is_word_separator(ws, &gc)) {
found = 1;
break;
}
@@ -5381,7 +5380,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING)
break;
continue;
if (format_is_word_separator(ws, &gc))
break;