circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-19 18:58:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.5-rc'

Browse Source
This commit is contained in:
Nicholas Marriott 2017-05-12 16:18:31 +01:00
commit 8331000764
3 changed files with 6 additions and 2 deletions

4
CHANGES
View File

@ -1,5 +1,9 @@
CHANGES FROM 2.4 to 2.5 09 May 2017
* Fix ECH with a background colour.
* Do not rely on the terminal not moving the cursor after DL or EL.
* Fix send-keys and send-prefix in copy-mode (so C-b C-b works). GitHub issue
905.

2
grid.c
View File

@ -472,7 +472,7 @@ grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny, u_int bg)
gd->linedata[yy].cellsize = px;
continue;
}
grid_expand_line(gd, yy, px + nx, bg);
grid_expand_line(gd, yy, px + nx, 8); /* default bg first */
for (xx = px; xx < px + nx; xx++)
grid_clear_cell(gd, xx, yy, bg);
}

2
screen-write.c
View File

@ -630,7 +630,7 @@ screen_write_clearcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
screen_write_initctx(ctx, &ttyctx);
ttyctx.bg = bg;
grid_view_clear(s->grid, s->cx, s->cy, nx, 1, 8);
grid_view_clear(s->grid, s->cx, s->cy, nx, 1, bg);
screen_write_collect_flush(ctx, 0);
ttyctx.num = nx;