From: nicm Date: Fri, 20 Aug 2021 20:04:22 +0000 (+0000) Subject: Spacing tweaks. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7d4cf267496cc223305608a5ee79989afc59fa39;p=openbsd Spacing tweaks. --- diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index ff0e6c89c23..30176be4c4c 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.292 2021/08/20 17:50:42 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.293 2021/08/20 20:04:22 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott @@ -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/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index e3e6b85042c..3cbfcd46506 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.329 2021/08/20 19:50:17 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.330 2021/08/20 20:04:22 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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);