diff --git a/format.c b/format.c index 1cf852c5..ebfe628c 100644 --- a/format.c +++ b/format.c @@ -3626,7 +3626,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s, break; cp++; - argv = xreallocarray (argv, argc + 1, sizeof *argv); + argv = xreallocarray(argv, argc + 1, sizeof *argv); value = xstrndup(cp, end - cp); argv[argc++] = format_expand1(es, value); free(value); diff --git a/window-copy.c b/window-copy.c index 3e08c039..c1a31b48 100644 --- a/window-copy.c +++ b/window-copy.c @@ -2841,6 +2841,7 @@ window_copy_command(struct window_mode_entry *wme, struct client *c, if (count == 0) return; command = args_string(args, 0); + if (m != NULL && m->valid && !MOUSE_WHEEL(m->b)) window_copy_move_mouse(m);