Merge branch 'obsd-master'

2 files changed, 4 insertions, 2 deletions

diff --git a/grid.c b/grid.c
index f1facc4c..c88a451b 100644
--- a/grid.c
+++ b/grid.c
@@ -1011,7 +1011,7 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
 		 * If this is now the last line, there is nothing more to be
 		 * done.
 		 */
-		if (yy + lines == gd->hsize + gd->sy)
+		if (yy + 1 + lines == gd->hsize + gd->sy)
 			break;
 		line = yy + 1 + lines;
 
@@ -1021,6 +1021,7 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
 		if (gd->linedata[line].cellused == 0) {
 			if (!wrapped)
 				break;
+			lines++;
 			continue;
 		}
 
diff --git a/tmux.1 b/tmux.1
index d6cb65b3..1d7e460e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3589,7 +3589,8 @@ and
 .Ql #} ,
 unless they are part of a
 .Ql #{...}
-replacement. For example:
+replacement.
+For example:
 .Bd -literal -offset indent
 #{?pane_in_mode,#[fg=white#,bg=red],#[fg=red#,bg=white]}#W .
 .Ed