From 8f1302282b02f07e0868fbcdb79bb5404010ad4e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 8 Nov 2014 12:58:31 +0000
Subject: [PATCH] Two improvements to reflow from Balazs Kezes:

- Don't extend the line to full width on insert/delete character which
  means leaves extra spaces when reflowing.

- Only mark a line wrapped when the cursor actually goes off the end,
  not on newlines which can be used for positioning.
---
 grid-view.c    | 4 ++--
 screen-write.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/grid-view.c b/grid-view.c
index badabd56..f96a2d9e 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -184,7 +184,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx)
 	px = grid_view_x(gd, px);
 	py = grid_view_y(gd, py);
 
-	sx = grid_view_x(gd, gd->sx);
+	sx = grid_view_x(gd, gd->linedata[py].cellsize);
 
 	if (px == sx - 1)
 		grid_clear(gd, px, py, 1, 1);
@@ -201,7 +201,7 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx)
 	px = grid_view_x(gd, px);
 	py = grid_view_y(gd, py);
 
-	sx = grid_view_x(gd, gd->sx);
+	sx = grid_view_x(gd, gd->linedata[py].cellsize);
 
 	grid_move_cells(gd, px, px + nx, py, sx - px - nx);
 	grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);
diff --git a/screen-write.c b/screen-write.c
index 37e2b548..e38c9f53 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -795,8 +795,6 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped)
 	gl = &s->grid->linedata[s->grid->hsize + s->cy];
 	if (wrapped)
 		gl->flags |= GRID_LINE_WRAPPED;
-	else
-		gl->flags &= ~GRID_LINE_WRAPPED;
 
 	if (s->cy == s->rlower)
 		grid_view_scroll_region_up(s->grid, s->rupper, s->rlower);