summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2023-09-01 16:01:55 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2023-09-01 16:01:55 +0000
commitc33ccc2be3c268db1991fc3634b0e1f0c6c4922a (patch)
treeecab1270f61e46790cf44942998ea59c4b6395c4 /usr.bin
parent07a9a2e8035341570f82b58bbeee072388059141 (diff)
Clear combine flag when a non-UTF-8 set of characters is encountered.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/screen-write.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 957f5bee1f0..72c8f3bde4d 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.219 2023/09/01 14:29:11 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.220 2023/09/01 16:01:54 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1792,6 +1792,8 @@ screen_write_collect_add(struct screen_write_ctx *ctx,
u_int sx = screen_size_x(s);
int collect;
+ ctx->flags &= ~SCREEN_WRITE_COMBINE;
+
/*
* Don't need to check that the attributes and whatnot are still the
* same - input_parse will end the collection when anything that isn't