From ea295ac397cdcb033697b4c3dd841762cab8955d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 23 Mar 2018 07:44:44 +0000
Subject: Fix size calculation when spreading out panes.

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

diff --git a/layout.c b/layout.c
index 4ccd6d79..bab95868 100644
--- a/layout.c
+++ b/layout.c
@@ -1023,7 +1023,7 @@ layout_spread_cell(struct window *w, struct layout_cell *parent)
 	changed = 0;
 	TAILQ_FOREACH (lc, &parent->cells, entry) {
 		if (TAILQ_NEXT(lc, entry) == NULL)
-			each = size - (each * (number - 1));
+			each = size - ((each + 1) * (number - 1));
 		change = 0;
 		if (parent->type == LAYOUT_LEFTRIGHT) {
 			change = each - (int)lc->sx;
-- 
cgit 


From 785ce66ab9fd68ce4b2ba8d26ed6dba4c17bf714 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 23 Mar 2018 19:17:03 +0000
Subject: Fix a regression: do not warn about no client in rename-window.

---
 cmd-rename-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd-rename-window.c b/cmd-rename-window.c
index 3393fb86..4d2ebb75 100644
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -46,7 +46,7 @@ static enum cmd_retval
 cmd_rename_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c = cmd_find_client(item, NULL, 0);
+	struct client	*c = cmd_find_client(item, NULL, 1);
 	struct session	*s = item->target.s;
 	struct winlink	*wl = item->target.wl;
 	char		*newname;
-- 
cgit 


From 8a81993ae156a898740947d3bd57ddc9f37567c1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 29 Mar 2018 08:03:51 +0000
Subject: Do not crash on empty window, reported by Jamie Macdonald in GitHub
 issue 1299. Patch from Thomas Adam.

---
 window-tree.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/window-tree.c b/window-tree.c
index 3c587cb9..2c466b36 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -296,7 +296,8 @@ window_tree_build_window(struct session *s, struct winlink *wl, void* modedata,
 	free(text);
 	free(name);
 
-	wp = TAILQ_FIRST(&wl->window->panes);
+	if ((wp = TAILQ_FIRST(&wl->window->panes)) == NULL)
+		goto empty;
 	if (TAILQ_NEXT(wp, entry) == NULL) {
 		if (!window_tree_filter_pane(s, wl, wp, filter))
 			goto empty;
-- 
cgit