From 6c1773542defa3f8f32640cd8b5a1dff1b3a4501 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 25 May 2026 15:49:22 +0100 Subject: [PATCH] Some trivial bits from master. --- layout-custom.c | 1 - tmux.h | 1 - tty.c | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/layout-custom.c b/layout-custom.c index 426ecf29..2942720c 100644 --- a/layout-custom.c +++ b/layout-custom.c @@ -216,7 +216,6 @@ layout_parse(struct window *w, const char *layout, char **cause) if (floating_lc != NULL) ncells += layout_count_cells(floating_lc); if (npanes > ncells) { - /* Modify this to open a new pane */ xasprintf(cause, "have %u panes but need %u", npanes, ncells); goto fail; diff --git a/tmux.h b/tmux.h index 75cc6658..21afb60c 100644 --- a/tmux.h +++ b/tmux.h @@ -1264,7 +1264,6 @@ struct window_pane { int yoff; int flags; - int saved_flags; #define PANE_REDRAW 0x1 #define PANE_DROP 0x2 #define PANE_FOCUSED 0x4 diff --git a/tty.c b/tty.c index 2db47cc1..0b5ae135 100644 --- a/tty.c +++ b/tty.c @@ -1380,7 +1380,7 @@ static void tty_clear_pane_area(struct tty *tty, const struct tty_ctx *ctx, u_int py, u_int ny, u_int px, u_int nx, u_int bg) { - u_int i, j, x, y, rx, ry; + u_int i, j, x, y, rx, ry; if (tty_clamp_area(tty, ctx, px, py, nx, ny, &i, &j, &x, &y, &rx, &ry)) tty_clear_area(tty, ctx, y, ry, x, rx, bg); @@ -2045,7 +2045,7 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx) { const struct grid_cell *gcp = ctx->cell; struct screen *s = ctx->s; - struct visible_ranges *r = NULL; + struct visible_ranges *r; u_int px, py, i, vis = 0; px = ctx->xoff + ctx->ocx - ctx->wox; @@ -2081,7 +2081,7 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx) tty_cursor_pane_unless_wrap(tty, ctx, ctx->ocx, ctx->ocy); tty_cell(tty, ctx->cell, &ctx->defaults, ctx->palette, - ctx->s->hyperlinks); + ctx->s->hyperlinks); if (ctx->flags & TTY_CTX_CELL_INVALIDATE) tty_invalidate(tty);