From: nicm <nicm@openbsd.org>
Date: Fri, 1 Sep 2023 16:01:54 +0000 (+0000)
Subject: Clear combine flag when a non-UTF-8 set of characters is encountered.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e755d0b3862fe2b2148d92504432c40c9056475a;p=openbsd

Clear combine flag when a non-UTF-8 set of characters is encountered.
---

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