Merge branch 'obsd-master'

2 files changed, 2 insertions, 1 deletions

diff --git a/menu.c b/menu.c
index 7f6933c5..16374115 100644
--- a/menu.c
+++ b/menu.c
@@ -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);
 }
diff --git a/window-copy.c b/window-copy.c
index 1efe01d0..b869fc83 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -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);