diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-04-29 21:27:47 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-04-29 21:27:47 +0000 |
| commit | 0c5bb371928f51fb0ddf027af1360da4c9ee584d (patch) | |
| tree | cf09cfb0aac3555b5aaa9986e57a7eae1ec50c63 | |
| parent | e4eab66036ca1438710b5b2d1d2d4b778854e31d (diff) | |
Fix UTF-8 combining characters in column 0, based on a diff from Keith
Winstein.
| -rw-r--r-- | usr.bin/tmux/screen-write.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c index c1599c36fb9..8fac027675e 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.118 2017/04/25 18:30:29 nicm Exp $ */ +/* $OpenBSD: screen-write.c,v 1.119 2017/04/29 21:27:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1316,12 +1316,12 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct utf8_data *ud, fatalx("UTF-8 data empty"); /* Retrieve the previous cell. */ - for (n = 1; n < s->cx; n++) { + for (n = 1; n <= s->cx; n++) { grid_view_get_cell(gd, s->cx - n, s->cy, &gc); if (~gc.flags & GRID_FLAG_PADDING) break; } - if (n == s->cx) + if (n > s->cx) return (NULL); *xx = s->cx - n; |