From f0669334189995dba860f59c3cf9cb12ae15865c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 28 May 2026 15:19:36 +0100 Subject: [PATCH 1/2] Uninstall the man page too. --- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index 068df02c..ba9142fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -240,6 +240,7 @@ if ENABLE_SIXEL dist_tmux_SOURCES += image.c image-sixel.c endif +# Add bits for fuzzing if enabled. if NEED_FUZZING check_PROGRAMS = \ fuzz/input-fuzzer \ @@ -268,3 +269,7 @@ install-exec-hook: $(mkdir_p) $(DESTDIR)$(mandir)/man1 $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ $(DESTDIR)$(mandir)/man1/tmux.1 + +# And uninstall it. +uninstall-hook: + rm -f $(DESTDIR)$(mandir)/man1/tmux.1 From 4ecf93487e9450fabf5c83ae080de126c295667d Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 29 May 2026 07:49:01 +0000 Subject: [PATCH 2/2] Use correct X position for redrawing wide characters. --- screen-write.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/screen-write.c b/screen-write.c index 91727136..c593dc0b 100644 --- a/screen-write.c +++ b/screen-write.c @@ -2350,7 +2350,8 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) struct tty_ctx ttyctx; u_int sx = screen_size_x(s), sy = screen_size_y(s); u_int width = ud->width, xx, not_wrap, i, n, vis; - int selected, skip = 1, redraw = 0, yoff = 0; + int selected, skip = 1, redraw = 0; + int yoff = 0, xoff = 0; struct visible_ranges *r; struct visible_range *ri; @@ -2451,10 +2452,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) skip = 0; /* Get visible ranges for the character before moving the cursor. */ - if (wp != NULL) + if (wp != NULL) { + xoff = wp->xoff; yoff = wp->yoff; - r = screen_redraw_get_visible_ranges(wp, s->cx, s->cy + yoff, width, - NULL); + } + r = screen_redraw_get_visible_ranges(wp, xoff + s->cx, s->cy + yoff, + width, NULL); /* * Move the cursor. If not wrapping, stick at the last character and