circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-17 18:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-02-09 12:01:12 +00:00
commit cb50a51127
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
screen-write.c
View File

@ -1153,11 +1153,9 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
return; return;
ctx->cells++; ctx->cells++;
/* Flush any existing scrolling. */
screen_write_collect_flush(ctx, 1);
/* If the width is zero, combine onto the previous character. */ /* If the width is zero, combine onto the previous character. */
if (width == 0) { if (width == 0) {
screen_write_collect_flush(ctx, 0);
if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) { if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {
screen_write_cursormove(ctx, xx, s->cy); screen_write_cursormove(ctx, xx, s->cy);
screen_write_initctx(ctx, &ttyctx); screen_write_initctx(ctx, &ttyctx);
@ -1167,6 +1165,9 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
return; return;
} }
/* Flush any existing scrolling. */
screen_write_collect_flush(ctx, 1);
/* If this character doesn't fit, ignore it. */ /* If this character doesn't fit, ignore it. */
if ((~s->mode & MODE_WRAP) && if ((~s->mode & MODE_WRAP) &&
width > 1 && width > 1 &&