diff --git a/options-table.c b/options-table.c
index c55ce715..b96d91b3 100644
--- a/options-table.c
+++ b/options-table.c
@@ -699,7 +699,8 @@ const struct options_table_entry options_table[] = {
 	{ .name = "pane-border-format",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] \"#{pane_title}\""
+	  .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
+	                 "\"#{pane_title}\""
 	},
 
 	{ .name = "pane-border-status",
diff --git a/tmux.c b/tmux.c
index f8654e2b..08b26326 100644
--- a/tmux.c
+++ b/tmux.c
@@ -193,8 +193,7 @@ main(int argc, char **argv)
 		if (setlocale(LC_CTYPE, "") == NULL)
 			errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
 		s = nl_langinfo(CODESET);
-		if (strcasecmp(s, "UTF-8") != 0 &&
-		    strcasecmp(s, "UTF8") != 0)
+		if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
 			errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
 	}