Merge branch 'obsd-master'

Conflicts:
	window-buffer.c

8 files changed, 8 insertions, 9 deletions

diff --git a/cmd-find-window.c b/cmd-find-window.c
index 92714498..22a54195 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -79,7 +79,7 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
 		xasprintf(&filter, "#{C:%s}", s);
 	else if (N)
 		xasprintf(&filter, "#{m:*%s*,#{window_name}}", s);
-	else if (T)
+	else
 		xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
 
 	new_args = args_parse("", 1, &argv);
diff --git a/cmd-set-option.c b/cmd-set-option.c
index ad058b8e..d8539ee7 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -254,7 +254,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 		RB_FOREACH(w, windows, &windows)
 			layout_fix_panes(w, w->sx, w->sy);
 	}
-	RB_FOREACH (s, sessions, &sessions)
+	RB_FOREACH(s, sessions, &sessions)
 		status_update_saved(s);
 
 	/*
diff --git a/format.c b/format.c
index 0773b6bf..3e158770 100644
--- a/format.c
+++ b/format.c
@@ -203,7 +203,7 @@ format_job_update(struct job *job)
 
 	log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out);
 
-	t = time (NULL);
+	t = time(NULL);
 	if (fj->status && fj->last != t) {
 		if (fj->client != NULL)
 			server_status_client(fj->client);
diff --git a/job.c b/job.c
index b42a68bc..01b270c2 100644
--- a/job.c
+++ b/job.c
@@ -157,7 +157,7 @@ job_read_callback(__unused struct bufferevent *bufev, void *data)
 	struct job	*job = data;
 
 	if (job->updatecb != NULL)
-		job->updatecb (job);
+		job->updatecb(job);
 }
 
 /*
diff --git a/options.c b/options.c
index 861bd8ac..c13696f4 100644
--- a/options.c
+++ b/options.c
@@ -114,7 +114,7 @@ options_free(struct options *oo)
 {
 	struct options_entry	*o, *tmp;
 
-	RB_FOREACH_SAFE (o, options_tree, &oo->tree, tmp)
+	RB_FOREACH_SAFE(o, options_tree, &oo->tree, tmp)
 		options_remove(o);
 	free(oo);
 }
diff --git a/screen-write.c b/screen-write.c
index 9f684bb3..c5af7c07 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -48,7 +48,7 @@ struct screen_write_collect_item {
 
 	struct grid_cell	 gc;
 
-	TAILQ_ENTRY (screen_write_collect_item) entry;
+	TAILQ_ENTRY(screen_write_collect_item) entry;
 };
 struct screen_write_collect_line {
 	TAILQ_HEAD(, screen_write_collect_item) items;
diff --git a/utf8.c b/utf8.c
index e2802936..8afdac97 100644
--- a/utf8.c
+++ b/utf8.c
@@ -427,8 +427,7 @@ utf8_rtrimcstr(const char *s, u_int width)
 	next = end - 1;
 
 	at = 0;
-	for (;;)
-	{
+	for (;;) {
 		if (at + next->width > width) {
 			next++;
 			break;
diff --git a/window-buffer.c b/window-buffer.c
index 4a6581ba..ea119611 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -198,7 +198,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata, u_int sx, u_int sy)
 	screen_write_start(&ctx, NULL, &s);
 	screen_write_clearscreen(&ctx, 8);
 
-	pdata = end = paste_buffer_data (pb, &psize);
+	pdata = end = paste_buffer_data(pb, &psize);
 	for (i = 0; i < sy; i++) {
 		at = 0;
 		while (end != pdata + psize && *end != '\n') {