From 2695c5305e593ba6aef50d71045fe8b216476b0b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 19 May 2026 13:23:21 +0100 Subject: [PATCH] More merge fixes. --- window.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/window.c b/window.c index 225fee1f..19075332 100644 --- a/window.c +++ b/window.c @@ -569,7 +569,6 @@ window_set_active_pane(struct window *w, struct window_pane *wp, int notify) return (1); } - static int window_pane_get_palette(struct window_pane *wp, int c) { @@ -2120,7 +2119,7 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp, int *out_size, int *out_flags, enum layout_type *out_type, struct cmdq_item *item, struct args *args, char **cause) { - int size, flags = *out_flags; + int size = -1, flags = *out_flags; enum layout_type type; u_int curval = 0; @@ -2128,7 +2127,6 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp, if (args_has(args, 'h')) type = LAYOUT_LEFTRIGHT; - /* If the 'p' flag is dropped then this bit can be moved into 'l'. */ if (args_has(args, 'l') || args_has(args, 'p')) { if (args_has(args, 'f')) { if (type == LAYOUT_TOPBOTTOM) @@ -2143,7 +2141,6 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp, } } - size = -1; if (args_has(args, 'l')) { size = args_percentage_and_expand(args, 'l', 0, INT_MAX, curval, item, cause); @@ -2151,7 +2148,7 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp, size = args_strtonum_and_expand(args, 'p', 0, 100, item, cause); if (cause == NULL) - size = curval * (size) / 100; + size = curval * size / 100; } if (*cause != NULL) return (-1); @@ -2164,7 +2161,6 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp, *out_size = size; *out_flags = flags; *out_type = type; - return (0); }