4 files changed, 8 insertions, 5 deletions
diff --git a/server-client.c b/server-client.c
index 27173ef1..c644bb01 100644
--- a/server-client.c
+++ b/server-client.c
@@ -543,7 +543,8 @@ have_event:
 				where = STATUS_RIGHT;
 				break;
 			case STYLE_RANGE_WINDOW:
-				wl = winlink_find_by_index(&s->windows, sr->argument);
+				wl = winlink_find_by_index(&s->windows,
+				    sr->argument);
 				if (wl == NULL)
 					return (KEYC_UNKNOWN);
 				m->w = wl->window->id;
diff --git a/tmux.h b/tmux.h
index 6d142ab9..bcdc99a4 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1244,8 +1244,8 @@ struct tty_ctx {
 	const struct grid_cell	*cell;
 	int			 wrapped;
 
-	u_int		 num;
-	void		*ptr;
+	u_int			 num;
+	void			*ptr;
 
 	/*
 	 * Cursor and region position before the screen was updated - this is
diff --git a/tty-term.c b/tty-term.c
index c408d968..52468faf 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -636,7 +636,8 @@ tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
 }
 
 const char *
-tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b, int c)
+tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
+    int c)
 {
 	return (tparm((char *) tty_term_string(term, code), a, b, c));
 }
diff --git a/tty.c b/tty.c
index 9efd78a0..594f02fa 100644
--- a/tty.c
+++ b/tty.c
@@ -2454,7 +2454,8 @@ tty_check_bg(struct tty *tty, struct window_pane *wp, struct grid_cell *gc)
 }
 
 static void
-tty_check_us(__unused struct tty *tty, struct window_pane *wp, struct grid_cell *gc)
+tty_check_us(__unused struct tty *tty, struct window_pane *wp,
+    struct grid_cell *gc)
 {
 	int	c;