From fb109ae97df2904b7c18618d073910505f104870 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 18 Oct 2016 19:25:26 +0000
Subject: [PATCH 1/2] xterm-keys was in the wrong place in the list; Dilyan
 Palauzov.

---
 tmux.1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tmux.1 b/tmux.1
index dfa6606c..419e3bbd 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3142,6 +3142,11 @@ see the
 .Ic message-command-style
 option.
 .Pp
+.It Xo Ic wrap-search
+.Op Ic on | off
+.Xc
+If this option is set, searches will wrap around the end of the pane contents.
+The default is on.
 .It Xo Ic xterm-keys
 .Op Ic on | off
 .Xc
@@ -3153,11 +3158,6 @@ function key sequences; these have a number included to indicate modifiers such
 as Shift, Alt or Ctrl.
 The default is off.
 .Pp
-.It Xo Ic wrap-search
-.Op Ic on | off
-.Xc
-If this option is set, searches will wrap around the end of the pane contents.
-The default is on.
 .El
 .It Xo Ic show-options
 .Op Fl gqsvw

From e0e9a54a325da2f5648fdb6f429f22a6c12a5fb3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 18 Oct 2016 19:52:49 +0000
Subject: [PATCH 2/2] Clear cell entry with grid_default_entry not
 grid_default_cell.

---
 grid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grid.c b/grid.c
index 9619c4fe..dbb4fe64 100644
--- a/grid.c
+++ b/grid.c
@@ -90,7 +90,7 @@ grid_clear_cell(struct grid *gd, u_int px, u_int py, u_int bg)
 	struct grid_cell_entry	*gce = &gl->celldata[px];
 	struct grid_cell	*gc;
 
-	memcpy(gce, &grid_default_cell, sizeof *gce);
+	memcpy(gce, &grid_default_entry, sizeof *gce);
 	if (bg & COLOUR_FLAG_RGB) {
 		gc = grid_extended_cell(gl, gce, &grid_default_cell);
 		gc->bg = bg;