From b74b047730226a64a64b1e1dd1cc1d7f3305ea53 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 26 Sep 2018 16:49:03 +0100
Subject: [PATCH] More of revert.

---
 format.c | 10 ++++------
 resize.c |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/format.c b/format.c
index 466f8d2d..e3552cba 100644
--- a/format.c
+++ b/format.c
@@ -52,8 +52,7 @@ static int	 format_replace(struct format_tree *, const char *, size_t,
 static void	 format_defaults_session(struct format_tree *,
 		     struct session *);
 static void	 format_defaults_client(struct format_tree *, struct client *);
-static void	 format_defaults_winlink(struct format_tree *, struct client *,
-		     struct winlink *);
+static void	 format_defaults_winlink(struct format_tree *, struct winlink *);
 
 /* Entry in format job tree. */
 struct format_job {
@@ -1347,7 +1346,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
 	if (s != NULL)
 		format_defaults_session(ft, s);
 	if (wl != NULL)
-		format_defaults_winlink(ft, c, wl);
+		format_defaults_winlink(ft, wl);
 	if (wp != NULL)
 		format_defaults_pane(ft, wp);
 }
@@ -1462,8 +1461,7 @@ format_defaults_window(struct format_tree *ft, struct window *w)
 
 /* Set default format keys for a winlink. */
 static void
-format_defaults_winlink(struct format_tree *ft, struct client *c,
-    struct winlink *wl)
+format_defaults_winlink(struct format_tree *ft, struct winlink *wl)
 {
 	struct session	*s = wl->session;
 	struct window	*w = wl->window;
@@ -1476,7 +1474,7 @@ format_defaults_winlink(struct format_tree *ft, struct client *c,
 
 	format_add(ft, "window_index", "%d", wl->idx);
 	format_add_cb(ft, "window_stack_index", format_cb_window_stack_index);
-	format_add(ft, "window_flags", "%s", window_printable_flags(wl, c));
+	format_add(ft, "window_flags", "%s", window_printable_flags(wl));
 	format_add(ft, "window_active", "%d", wl == s->curw);
 
 	format_add(ft, "window_bell_flag", "%d",
diff --git a/resize.c b/resize.c
index fc761f34..fef8feeb 100644
--- a/resize.c
+++ b/resize.c
@@ -96,7 +96,7 @@ default_window_size(struct session *s, struct window *w, u_int *sx, u_int *sy,
 		}
 		if (*sx == 0 || *sy == 0)
 			goto manual;
-	} else if (type == WINDOW_SIZE_SMALLEST) {
+	} else {
 		*sx = *sy = UINT_MAX;
 		TAILQ_FOREACH(c, &clients, entry) {
 			if (c->session == NULL)