Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2020-05-25 14:01:19 +01:00
commit 32ce468b22
2 changed files with 2 additions and 1 deletions

1
menu.c
View File

@ -111,6 +111,7 @@ menu_create(const char *title)
menu = xcalloc(1, sizeof *menu);
menu->title = xstrdup(title);
menu->width = format_width(title);
return (menu);
}

View File

@ -3167,7 +3167,7 @@ window_copy_match_at_cursor(struct window_copy_mode_data *data)
*/
for (at = start; at <= end; at++) {
py = at / sx;
px = at % (py * sx);
px = at - (py * sx);
grid_get_cell(gd, px, py, &gc);
buf = xrealloc(buf, len + gc.data.size + 1);