Merge branch '2.5-rc'

3 files changed, 6 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index d683a276..5216d969 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.
 
diff --git a/grid.c b/grid.c
index 4f728dbe..3b03df75 100644
--- a/grid.c
+++ b/grid.c
@@ -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);
 	}
diff --git a/screen-write.c b/screen-write.c
index 894da4b7..1af623b1 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -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;